phoenix-firestorm/indra
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
..
cmake svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit 2009-08-31 17:16:21 +00:00
copy_win_scripts QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
integration_tests Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into 2009-09-04 12:11:27 +00:00
lib/python Adding back the setting of "DEBUG", the lack of which caused many unit 2009-05-19 15:19:39 +00:00
linux_crash_logger svn merge -r113780:113785 2009-03-09 23:42:07 +00:00
linux_updater Fixed the Linux build of viewer-2.0.0-3. 2009-09-04 17:05:31 +00:00
llaudio Fixed the Linux build of viewer-2.0.0-3. 2009-09-04 17:05:31 +00:00
llcharacter merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llcommon Remove llfasttimer.h from linden_common.h, not necessary and adds 15K lines of header code to every library .cpp file. 2009-09-08 22:09:11 +00:00
llcrashlogger merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llimage merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llimagej2coj merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llinventory merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 2009-09-07 22:55:07 +00:00
llmath merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
llmessage Trivial commit for hg import purposes 2009-09-01 18:01:40 +00:00
llplugin merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
llprimitive merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llrender merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 2009-09-07 22:55:07 +00:00
llui merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
llvfs Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
llwindow merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
llxml merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 2009-08-24 20:04:52 +00:00
llxuixml merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
lscript Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3 2009-08-29 06:23:41 +00:00
mac_crash_logger svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
mac_updater svn merge -r117314:117337 2009-04-16 23:45:35 +00:00
media_plugins svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit 2009-08-31 17:16:21 +00:00
newview merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
test Fix deprecated conversion from string constant to ‘char*’ warnings 2009-09-08 09:07:57 +00:00
test_apps/llplugintest build issue - const invariance in llplugintest/llmediaplugintest 2009-09-03 02:57:14 +00:00
tools/vstool
win_crash_logger merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
win_updater svn merge -r121194:121210 2009-05-22 09:58:47 +00:00
CMakeLists.txt svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 2009-08-27 19:00:18 +00:00
develop.py Fix syntax error introduced by your's truely into develop.py 2009-09-01 01:46:05 +00:00