summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterjoystick.h
AgeCommit message (Collapse)Author
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-11-12svn merge -c102054Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015 QAR-1016 joystick+spacenav improvements MERGE
2008-04-04QAR-427Steven Bennetts
merge 3dconnex-merge -r 84010 : 84039 -> release