| .. |
|
cmake
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +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
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +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
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
llcommon
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +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
|
svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-07-24 16:20:15 +00:00 |
|
llmath
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +00:00 |
|
llmessage
|
svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-links__merge__viewer-2.0.0.3-r127634 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-07-23 23:41:12 +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
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
llui
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
llvfs
|
svn merge -r 127173:127174 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_04
|
2009-07-15 23:16:09 +00:00 |
|
llwindow
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +00:00 |
|
llxml
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +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
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
test
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +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
|
Merge in disabling of universal builds.
|
2009-07-24 01:31:53 +00:00 |
eb853f55c0