summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersettingsdebug.h
AgeCommit message (Expand)Author
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven Bennetts
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-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange