Context Navigation

pxchip.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

Property svn:mergeinfo changed

/branches/czw_branch/20100519 (added)	merged: 28044-28045,28164,28245,28304,28334,28338
/branches/haf_branches/ipp.20100512 (added)	merged: 27935-27937,27956,28034-28037,28058-28061,28101-28102,28104,28168-28171,28177,28180
/trunk (added)	merged: 28178,28181-28187,28190-28193,28196,28201-28229,28232,28241-28244,28246-28250,28252-28298,28300-28302,28305-28311,28313,28317,28319-28332,28335-28337,28339-28351,28354-28373,28375-28383,28385-28390,28392,28395,28398-28409,28411-28416,28418-28429,28432-28434,28436,28438,28442,28444,28446-28449,28451,28453

Property svn:ignore

r28043	r28484
40	40	psMetadataAddStr(md, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL);
41	41	psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL);
42		psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL);
	42	psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<=)", NULL);
43	43	psMetadataAddStr(md, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL);
44	44	psMetadataAddStr(md, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL);

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