| .. |
|
lib/python
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +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
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llcommon
|
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
|
2007-07-11 21:29:02 +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
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
llmath
|
Missed a conflict marker in release-candidate to release merge.
|
2007-07-11 22:23:21 +00:00 |
|
llmessage
|
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
|
2007-07-12 22:18:34 +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
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
llui
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +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
|
svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-07-02 17:10:30 +00:00 |
|
lscript
|
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
|
2007-07-12 22:18:34 +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
|
Fix build borkage on OS X.
|
2007-07-12 22:33:48 +00:00 |
|
test
|
svn merge -r65092:65220 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance-r64837
|
2007-07-12 22:18:34 +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 |
3f41fdbfcf