phoenix-firestorm/indra/llimage
Andrew Meadows 222bca24c1 svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
..
CMakeLists.txt libpng needs linking against zlib 2008-08-30 03:55:11 +00:00
llimage.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llimage.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llimagebmp.cpp QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release 2008-07-22 19:01:52 +00:00
llimagebmp.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llimagedxt.cpp 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426 2008-04-03 19:21:14 +00:00
llimagedxt.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llimagej2c.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llimagej2c.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llimagejpeg.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llimagejpeg.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llimagepng.cpp Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llimagepng.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llimagetga.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llimagetga.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llimageworker.cpp svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llimageworker.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
llmapimagetype.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
llpngwrapper.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llpngwrapper.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00