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
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
a3f3ab7e11
QAR-449 Viewer 1.20 RC 1
...
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17 02:56:14 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
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
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Steven Bennetts