35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +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
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
4ff16b735f
QAR-907: svn merge -r 98908:98910 svn+ssh://svn/svn/linden/qa/sim-metrics/sim-metrics2-release-merge-98903 into release
2008-10-09 18:07:46 +00:00
9a7d68cfce
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
2008-07-31 12:15:15 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
dc48f1c741
svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
...
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.
QAR-448
2008-04-03 22:50:22 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
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
f8511d77a7
EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
...
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-04 16:46:00 +00:00
f41b7bb8df
-74901 (back out premature commit to release)
2007-12-03 19:44:04 +00:00
d5eef2d8a6
merge -r 73391:74133 maint-ui-3 -> release
2007-12-03 19:36:44 +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
aa8b0cbe69
QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4
2007-10-17 22:09:27 +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
84ea29c69c
svn merge -r67650:68653 branches/release-viewer-stats
...
Branch reviewed by Don. Passed QA buildme this morning.
NOTE: This change requires a DB schema upgrade. Upgrade script:
indra/upgrade/viewer-stats/redo_viewer_stats
2007-08-29 00:08:01 +00:00
ad04e5fc55
revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
...
reverting jakes accidental check in
2007-06-29 01:49:41 +00:00
e3989d3848
Changes to make Logitech code more LL Code Standards compliant, plus remove all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory.
2007-06-29 01:24:26 +00:00
60a09f20f4
Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden/release into release
2007-05-08 20:42:04 +00:00
2f438a409e
svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
...
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-04-18 21:08:54 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +00:00
7f50e28b0f
merge -r 56842:57026 maintenance.
2007-01-23 19:12:31 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Xiaohong Bao