584962d5c7
svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
2009-10-23 15:21:49 +00:00
d08b0b6ae8
merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command:
...
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .
Progress can be tracked in DEV-32551.
-Nyx
2009-10-16 17:56:30 +00:00
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
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
6db6d81b0a
Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
...
No conflicts in the merge.
Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +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
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
2e32d44e71
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
...
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
138bf17c3c
merge of age verification changes from QAR-76 to release; changes were originally made on the age_verification_2007xxxx branches; final changes were QA'd on age_verification_20071112.
2007-11-15 19:10:29 +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
0277259455
svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-04-11 17:54:18 +00:00
5cc44523f7
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
2007-02-09 23:35:12 +00:00
305c74d516
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
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Loren Shih