phoenix-firestorm/indra
Tess Chu 3b2515fd5f merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.
2007-08-10 02:15:37 +00:00
..
lib/python merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. 2007-08-10 02:15:37 +00:00
linux_crash_logger EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-26 01:22:23 +00:00
llaudio svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-06-04 18:46:59 +00:00
llcharacter Merge down from Branch_1-18-1: 2007-08-02 01:18:34 +00:00
llcommon merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. 2007-08-10 02:15:37 +00:00
llimage svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
llimagej2coj svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
llinventory svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llmath Merge down from Branch_1-18-1: 2007-08-02 01:18:34 +00:00
llmessage svn merge -r67131:67483 svn+ssh://svn/svn/linden/branches/Branch_1-18-1 2007-08-08 00:55:57 +00:00
llprimitive svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
llrender svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llui Merge down from Branch_1-18-1: 2007-08-02 01:18:34 +00:00
llvfs svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llwindow svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
llxml svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-20 20:38:05 +00:00
lscript merge -r66262:66263 linden/branches/kelly/llgetobjectdetails-2 2007-07-26 16:51:08 +00:00
mac_crash_logger Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
mac_updater Merge down from Branch_1-18-1: 2007-08-02 01:18:34 +00:00
newview merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. 2007-08-10 02:15:37 +00:00
test merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla. 2007-08-10 02:15:37 +00:00
win_crash_logger svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-07-18 21:22:40 +00:00
win_updater result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00