Context Navigation

ccd.c

Timestamp:

Jun 12, 2015, 9:26:15 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src/opihi

Files:

branches/eam_branches/ipp-20150419/Ohana/src/opihi
- Property svn:mergeinfo set to
  /branches/eam_branches/ipp-20150112/Ohana/src/opihi merged eligible
  /branches/eam_branches/ipp-20150405/Ohana/src/opihi merged eligible
  /trunk/Ohana/src/opihi merged eligible

r34088	r38443
69	69	/* lock, load, unlock catalog */
70	70	catalog.filename = skylist[0].filename[k];
71		catalog.catflags = ~~LOAD_AVES \| LOAD_MEAS \| LOAD_SECF~~;
	71	catalog.catflags = DVO_LOAD_AVERAGE \| DVO_LOAD_MEASURE \| DVO_LOAD_SECFILT;
72	72	catalog.Nsecfilt = 0;
73	73

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

/branches/eam_branches/ipp-20150112/Ohana/src/opihi	merged	eligible
/branches/eam_branches/ipp-20150405/Ohana/src/opihi	merged	eligible
/trunk/Ohana/src/opihi	merged	eligible