Context Navigation

pmSourceIO.h

Timestamp:

Mar 29, 2015, 6:08:31 AM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150112/psModules/src/objects

Files:

Property svn:ignore

Property svn:mergeinfo set to

/branches/eam_branches/ipp-20140423/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-20140610/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-20140717/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-20140813/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-20140904/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-20150326/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-ops-20130712/psModules/src/objects	merged	eligible
/branches/eam_branches/ipp-pv3-20140717-merge/psModules/src/objects	merged	eligible
/branches/eam_branches/ps2-tc3-20130727/psModules/src/objects	merged	eligible
/tags/ipp-20130712/psModules/src/objects	merged	eligible
/tags/ipp-20141119/psModules/src/objects	merged	eligible
/tags/ipp-20141224/psModules/src/objects	merged	eligible
/tags/ipp-20150115/psModules/src/objects	merged	eligible
/tags/ipp-pv3-20140717/psModules/src/objects	merged	eligible
/trunk/psModules/src/objects	merged	eligible

r37325	r38058
46	46	MK_PROTO(CMF_PS1_DV3);
47	47	MK_PROTO(CMF_PS1_DV4);
	48	MK_PROTO(CMF_PS1_DV5);
48	49
49	50	int pmSourceGetDophotType (pmSource *source);

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