Commit Graph

7 Commits (bea2dfbc22bb2d80755dcf9daf810e1ea0329c2d)

Author SHA1 Message Date
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 45df2d70f0 More line endings. 2010-08-19 13:08:57 -05:00
Dave Parks 2fea1d5d33 Integrate SIMD API from oreh/server-trunk-oreh 2010-08-19 12:25:15 -05: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
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
Don Kjer b089fc559a EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **

ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00