Commit Graph

13 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
brad kittenbrink dbc92691a6 Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies. 2011-05-05 17:13:52 -07:00
Richard Linden a5e0c51de9 custom skylight key bindings 2010-09-30 20:07:50 -07:00
Richard Linden 7f003fa20d converted keys.ini to keys.xml and use LLInitParam parsing 2010-09-30 16:43:44 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04: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
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Don Kjer 3855896097 EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release

ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release

dataserver-is-deprecated
2008-05-19 17:02:33 +00:00
Brian McGroarty d273ba2ce2 Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated 2008-05-07 20:48:38 +00:00
Brian McGroarty e1e1212daa QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated 2008-05-07 17:17:42 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-03-04 16:59:57 +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
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00