summaryrefslogtreecommitdiff
path: root/indra/llxml/llcontrol.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-16Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.Mark Palange
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-03-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
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
2008-02-29svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...Josh Bell
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-02-05merge -r 57111:57464 maintenance.Steven Bennetts
2007-01-02Print done when done.James Cook