summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoicedevicesettings.h
AgeCommit message (Expand)Author
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-04-03svn merge -r 83778:83944 maint-ui-10-mergeJames Cook