Aaron Brashears
|
5595a99623
|
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 |
|
Don Kjer
|
13c391f198
|
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
|
2007-09-14 21:13:20 +00:00 |
|
Bryan O'Sullivan
|
ce7682c2a4
|
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
|
2007-07-18 21:22:40 +00:00 |
|
Josh Bell
|
ea8fb7238e
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
Richard Nelson
|
73bc0fb42b
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |