summaryrefslogtreecommitdiff
path: root/indra/newview/llvlcomposition.cpp
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2009-11-16fix for DEV-2530: crash after teleporting to refion.Xiaohong Bao
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-04-16svn merge -r117314:117337Adam Moss
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-04-11svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-04-03merge -r 59337:59951 Branch_1-14-0 -> release.Steven Bennetts
2007-01-18merge -r 56738:56842 maintenance.Steven Bennetts
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 13:21:44 +0000