Context Navigation

pmSourceIO_SMPDATA.c

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

Property svn:mergeinfo changed

/branches/bills_branches/bills_201312 (added)	merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450
/trunk (added)	merged: 36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478

r36375	r36480
226	226	}
227	227
228		bool pmSourcesWrite_SMPDATA_XGAL(psFits fits, psArray sources, char extname, psMetadata recipe)
	228	bool pmSourcesWrite_SMPDATA_XGAL(psFits fits, pmReadout readout, psArray sources, char extname, psMetadata *recipe)
229	229	{
230	230	return true;

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

/branches/bills_branches/bills_201312/psModules (added)	merged: 36389,36412,36422-36424
/trunk/psModules (added)	merged: 36441,36455