Commit Graph

9 Commits (08ae21f52dbbe6245ac8deee0fdfd5df4d3dba53)

Author SHA1 Message Date
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Adam Moss 6af0219273 DEV-41080 fix and upgrade v4color_test.cpp to a real unit test. 2009-10-08 16:44:44 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Richard Nelson 2ce0fc5f18 svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release 2007-04-05 00:59:55 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00