Richard Nelson
|
eb853f55c0
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
James Cook
|
52aeaa3284
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
|
2009-07-07 00:53:05 +00:00 |
|
Steven Bennetts
|
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 |
|
Christian Goetze
|
1aa0416aef
|
svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
|
2009-03-13 21:28:40 +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 |
|
Kent Quirk
|
667ca55bad
|
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
|
2009-01-05 18:59:12 +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 |
|
Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
Christian Goetze
|
5ec8bbbe22
|
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
|
2007-10-10 00:01:43 +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 |
|
Christian Goetze
|
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 |
|
Josh Bell
|
ea8fb7238e
|
svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-31 01:41:19 +00:00 |
|
Richard Nelson
|
73bc0fb42b
|
merge -r 56779:58057 /branches/selection_management
|
2007-02-17 03:02:16 +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 |
|
Aaron Brashears
|
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 |
|
Steven Bennetts
|
71d28bdbf0
|
merge release@56803 release-candidate@56833
|
2007-01-17 23:02:00 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |