07c24d0437
Passed QA, merging minifriends-3:70006 back to release
2007-09-19 21:28:44 +00:00
b2595c369f
Merge sl-search-opt-in back into the release branch
...
Reviewed by Josh and Don
2007-08-30 22:11:52 +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
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
3b2515fd5f
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
...
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
2007-08-10 02:15:37 +00:00
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
d373dcc7cb
svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
...
* WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
ce7682c2a4
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
...
(only inside indra)
(josh) Original log message was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:22:40 +00:00
57b8fef824
svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.
2007-07-11 21:29:02 +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
f118e7c80b
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
2007-06-13 18:02:37 +00:00
029130bf9c
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-23 21:17:34 +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
4ecb9cb63e
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
2007-05-01 21:39:25 +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
ea8fb7238e
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31 01:41:19 +00:00
00dbacb215
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release
2007-03-14 23:03:50 +00:00
4dabd9c047
merge release@58699 beta-1-14-0@58707 -> release
2007-03-02 21:25:50 +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
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Melinda Green