| Age | Commit message (Collapse) | Author | 
|---|
|  | Remove code that composites RGBA PNG images that specify a background
color down to RGB. | 
|  |  | 
|  | Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff
applied with fuzz 3:
	patching file indra/cmake/PNG.cmake
	Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.cpp
	Hunk #1 succeeded at 215 (offset -2 lines).
	Hunk #2 succeeded at 363 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.h
	Hunk #1 succeeded at 31 (offset -2 lines).
Added entry in doc/contributions.txt.
No further changes other than that. | 
|  |  | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | dataserver-is-deprecated | 
|  | svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated | 
|  | svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. | 
|  |  |