phoenix-firestorm/indra
Don Kjer ad04e5fc55 revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
reverting jakes accidental check in
2007-06-29 01:49:41 +00:00
..
lib/python svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
linux_crash_logger merge -r 56696:57082 Branch_1-13-2 2007-01-24 20:21: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 -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llcommon merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llimage merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +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 merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llmath merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llmessage Tweak initializer order to silence a gcc warning (now treated as error) 2007-06-22 20:56:24 +00:00
llprimitive svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release 2007-05-23 21:17:34 +00:00
llrender merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llui merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llvfs merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llwindow merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
llxml merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
lscript merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +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 -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
newview revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release 2007-06-29 01:49:41 +00:00
test merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
win_crash_logger svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +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