IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 30586 for branches/czw_branch/20101203/ippTools/src/disttool.c

Timestamp:

Feb 11, 2011, 4:29:48 PM (15 years ago)

Author:

watersc1

Message:

Trying to merge back into trunk.

Location:

branches/czw_branch/20101203

Files:

: 2 edited

. (modified) (1 prop)
ippTools/src/disttool.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/czw_branch/20101203

Property svn:mergeinfo changed

merged: 30120,30122,30124,30126-30127,30129,30131-30132,30134,30136,30143-30144,30146-30150,30178-30182,30184-30193,30198,30203,30205-30207,30216-30217,30227,30234,30236,30238,30240,30242,30244-30245,30248,30250-30251,30253-30254,30256-30261,30263-30264,30272,30274-30275,30277,30280,30282-30283,30290,30292-30293,30295-30297,30306,30313-30319,30326-30328,30330,30336,30338-30340,30345,30347,30352-30354,30356,30358-30361,30363-30370,30372-30378,30380-30382,30387-30390,30392-30394,30396-30398,30402,30404-30405,30407,30411-30412,30426,30429,30431,30433-30434,30436-30438,30453-30458,30460,30462,30464-30466,30468-30470,30472,30483,30485,30487-30489,30492-30493,30495,30497

branches/czw_branch/20101203/ippTools/src/disttool.c

r29067	r30586
857	857	psFree(where);
858	858
	859	psStringAppend(&query, "\nORDER BY priority DESC, dist_id");
	860
859	861	// treat limit == 0 as "no limit"
860	862	if (limit) {

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: