Context Navigation

camera.config

Timestamp:

Dec 3, 2010, 2:35:32 AM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101103/ippconfig

Files:

Property svn:mergeinfo set to

/branches/czw_branch/20100427/ippconfig	merged	eligible
/branches/czw_branch/20100519/ippconfig	merged	eligible
/branches/czw_branch/20100817/ippconfig	merged	eligible
/branches/eam_branches/ipp-20100823/ippconfig	merged	eligible
/branches/haf_branches/ipp.20100512/ippconfig	merged	eligible
/branches/pap/ippconfig	merged	eligible
/tags/ipp-20101029/ippconfig	merged	eligible
/trunk/ippconfig	merged	eligible

r29394	r29906
155	155
156	156	# don't censor any masked pixels
157		NO.CENSOR U32 0xFFFFFFFF
	157	MASK.NO.CENSOR U32 4294967295

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