summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoicedevicesettings.h
AgeCommit message (Collapse)Author
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-04-03svn merge -r 83778:83944 maint-ui-10-mergeJames Cook
QAR-442