summaryrefslogtreecommitdiff
path: root/indra/llimage
AgeCommit message (Collapse)Author
2007-07-18svn merge -r64837:65485 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions.
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-04-07Fixed Mac deployment compiler warning (uninitialized memory read, but in ↵James Cook
unused code). Reviewed with Steve long ago.
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-16SL-35314 - fix many openjpeg woes. QA'd.Adam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887 --> release
2007-03-09svn merge -r 58902:58986 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-23merge -r 56842:57026 maintenance.Steven Bennetts
2007-01-10svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
2007-01-02Print done when done.James Cook