summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterjoystick.h
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-01-28CID-378Tofu Linden
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
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-11-12svn merge -c102054Adam Moss
2008-04-04QAR-427Steven Bennetts