phoenix-firestorm/indra
Steven Bennetts b01d567a5d EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
..
lib/python EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00
linux_crash_logger svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
llaudio 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
llcharacter EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge 2007-12-07 20:27:13 +00:00
llcommon EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge 2007-12-07 20:27:13 +00:00
llcrashlogger svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
llimage Merge maint-viewer @ r71064 2007-10-11 19:43:20 +00:00
llimagej2coj Merge maint-viewer @ r71064 2007-10-11 19:43:20 +00:00
llinventory merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112. 2007-11-15 19:10:29 +00:00
llmath EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00
llmessage svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release 2007-12-06 20:32:46 +00:00
llprimitive EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00
llrender 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
llui EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge 2007-12-07 20:27:13 +00:00
llvfs svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
llwindow EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge 2007-12-07 20:27:13 +00:00
llxml svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release 2007-11-01 22:02:35 +00:00
lscript Reverting accidental changes from age-verification merge (only affects vc8 build) 2007-11-20 03:42:06 +00:00
mac_crash_logger svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
mac_updater EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00
newview EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge 2007-12-07 20:27:13 +00:00
test Result of svn merge -r74235:74242 svn+ssh://svn/svn/linden/branches/robust-pump into release 2007-12-05 01:15:45 +00:00
win_crash_logger svn merge -r74104:74124 svn+ssh://svn/svn/linden/branches/crash-logger-cleanup-merge-6 2007-11-20 23:42:48 +00:00
win_updater EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release 2007-12-05 23:43:56 +00:00