angela
|
6a2b10d869
|
clean up LLFrstUse and it's notification but leave OverideKeys and Sandbox intact -- reviewed by james
|
2010-01-14 11:40:24 +08:00 |
|
James Cook
|
ca51e8f33d
|
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
|
2009-07-27 16:50:01 +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
|
55c25229b7
|
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
|
2008-04-03 18:43:54 +00:00 |
|
Josh Bell
|
98fd90ddd6
|
svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release
QAR-275 Parcel Media
Sam made me do it.
|
2008-02-14 01:45:59 +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 |
|
Monroe Williams
|
7138fb673a
|
Merge down from Branch_1-18-1:
svn merge --ignore-ancestry svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
|
2007-08-02 01:18:34 +00:00 |
|
Kelly Washington
|
e03bb0606a
|
merge -r62831:64079 branches/maintenance to release
|
2007-06-21 22:40:22 +00:00 |
|
Don Kjer
|
a154ec72f7
|
svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-08 22:20:26 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |