phoenix-firestorm/indra
James Cook 68da2bdfee Merge build patch for Linux server builds from xui-army. I believe this fixes the "llui_libtest -lllui not found" build error.
Merging revisions 123378-123379 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army into G:\viewer-2-0-link\latest, respecting ancestry
2009-06-23 22:54:48 +00:00
..
cmake merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +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 Merge build patch for Linux server builds from xui-army. I believe this fixes the "llui_libtest -lllui not found" build error. 2009-06-23 22:54:48 +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
llaudio merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llcharacter merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llcommon trivial comment fixes for typos that were bugging me... 2009-06-22 12:03:54 +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 -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llmath merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3 2009-06-21 17:16:27 +00:00
llmessage QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to 2009-06-22 12:52:18 +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 -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llui QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to 2009-06-22 12:52:18 +00:00
llvfs merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llwindow merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
llxml QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to 2009-06-22 12:52:18 +00:00
lscript merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +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
newview Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed. 2009-06-23 21:59:31 +00:00
test merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
tools/vstool DEV-16502 - Cleaned up error messages, better error handling in vstool/main.cs 2008-06-25 17:56:53 +00:00
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 merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3 2009-06-21 08:04:56 +00:00
develop.py result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496 2009-06-19 23:24:11 +00:00