Adam Moss
|
feabeb4965
|
DEV-35039 Viewer 2.0 Help System - Viewer Development
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
|
2009-09-30 17:46:31 +00:00 |
|
Richard Nelson
|
eb853f55c0
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
Xiaohong Bao
|
77f56a3f3d
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
Steven Bennetts
|
9ec432034d
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
|
2009-06-21 08:04:56 +00:00 |
|
Aaron Brashears
|
e3cf284388
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
Steven Bennetts
|
25c10ed028
|
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
|
2008-06-26 00:39:00 +00:00 |
|
James Cook
|
36fccc3888
|
svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa).
|
2008-04-30 23:30:09 +00:00 |
|
Christian Goetze
|
5ec8bbbe22
|
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
|
2007-10-10 00:01:43 +00:00 |
|
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 |
|
Christian Goetze
|
ce0a5fe145
|
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
|
2007-08-21 22:17:53 +00:00 |
|
Kelly Washington
|
e03bb0606a
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
Josh Bell
|
00dbacb215
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
|
2007-03-14 23:03:50 +00:00 |
|
Steven Bennetts
|
71d28bdbf0
|
merge release@56803 release-candidate@56833
|
2007-01-17 23:02:00 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |