summaryrefslogtreecommitdiff
path: root/indra/llimage/llpngwrapper.h
AgeCommit message (Expand)Author
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington