livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/lscript
History
Andrew Meadows 222bca24c1 svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 
this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated
 		2008-09-05 22:03:35 +00:00
..
lscript_compile QAR-782 Merge featurettes batch #2 2008-08-13 19:37:05 +00:00
lscript_execute svn merge -r94413:95195 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server -> release 2008-08-29 09:20:43 +00:00
lscript_library svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
CMakeLists.txt svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
lscript_alloc.h QAR-570 maint-render-4 merge 2008-05-08 18:41:20 +00:00
lscript_byteconvert.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
lscript_byteformat.h svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 2008-09-05 22:03:35 +00:00
lscript_execute.h svn merge -r 93885:94413 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release 2008-08-14 22:06:38 +00:00
lscript_export.h 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
lscript_http.h 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
lscript_library.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
lscript_rt_interface.h svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00