summaryrefslogtreecommitdiff
path: root/indra/newview/lldrawpoolwater.cpp
AgeCommit message (Expand)Author
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
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-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2007-12-07EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-m...Steven Bennetts
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-07-20svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-21svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-02Print done when done.James Cook