Robert Knop 189599b6ff Merging from server/server-1.25 back to trunk. ... svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv.		2008-12-04 22:36:34 +00:00
..
lscript_compile	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
lscript_execute	Merging from server/server-1.25 back to trunk.	2008-12-04 22:36:34 +00:00
lscript_library	QAR-829: svn merge -r98245:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/dev_10747_5 -> release	2008-10-07 21:53:42 +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 -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release	2008-09-17 10:21:38 +00:00
lscript_export.h	…
lscript_http.h	…
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