Nat Goodspeed
|
429fa5a494
|
Skip fragile (local ISP dependent) llhttpclient integration test.
|
2010-02-03 15:50:57 -05:00 |
|
Mark Palange
|
0274c1f2b1
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
|
2009-07-16 17:54:58 +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 |
|
Aaron Brashears
|
0a5c9731fd
|
Result of svn merge -r105061:106057 svn+ssh://svn/svn/user/phoenix/upgrade-tut into trunk. QAR-1074
|
2008-12-18 01:30:09 +00:00 |
|
Christian Goetze
|
1a14cd34a9
|
svn merge -c 90839 svn+ssh://svn.lindenlab.com/svn/linden/branches/tulla/file-move-merge
|
2008-06-28 21:38:26 +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
|
3314f78a36
|
do not attempt to use secondlife.com in unit tests for now.
|
2008-02-05 23:41:40 +00:00 |
|
Josh Bell
|
df4d167cd1
|
svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
|
2007-12-21 06:44:41 +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 |
|
Don Kjer
|
70aaa3e444
|
svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-04 21:57:06 +00:00 |
|
Don Kjer
|
1c909afe39
|
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
|
2007-05-02 21:24:47 +00:00 |
|
Don Kjer
|
4ecb9cb63e
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
Kelly Washington
|
437882ca3b
|
merge r58577:58578 Branch_1-13-3 to release
|
2007-03-05 19:08:01 +00:00 |
|
Aaron Brashears
|
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 |
|
Mark Lentczner
|
d0d4670f49
|
merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
|
2007-02-06 00:57:33 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |