Context Navigation

ippToPspsConfig.h

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

r27345	r28484
59	59	// getters
60	60	bool ippToPspsConfig_getFilterId(IppToPspsConfig* this, const char* filterType, int8_t* filterId);
	61	bool ippToPspsConfig_getSurveyId(IppToPspsConfig* this, const char* surveyType, int8_t* surveyId);
61	62
62	63	#endif // IPPTOPSPSCONFIG_H

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