summaryrefslogtreecommitdiff
path: root/indra/newview/llwaterparammanager.h
AgeCommit message (Expand)Author
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-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-11QAR-566 maint-viewer-5-merge-2Steven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink