58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
db5cda2667
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
...
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +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
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +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
52562e2e66
svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
...
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00
35b4a91129
svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release
...
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
2008-07-22 20:55:02 +00:00
df4f20d4f5
merge uv-picking branch.
...
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
2008-07-22 20:12:37 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
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
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
050dad0ce3
merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079
2007-11-07 22:55:27 +00:00
5ec8bbbe22
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
2007-10-10 00:01:43 +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
b089fc559a
EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
...
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
d4462963c6
merge -r 58503:58641 maintenance -> release
2007-03-02 19:11:06 +00:00
73bc0fb42b
merge -r 56779:58057 /branches/selection_management
2007-02-17 03:02:16 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Richard Nelson