summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwater.cpp
AgeCommit message (Expand)Author
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC...Mark Palange
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink