Leyla Farazha
|
d6db0f8b29
|
EXT-1393 "none" does not appear in object group list
EXT-1479 I18N: string in /en/widgets/location_input.xml wont honor its translation
and made tabs height customizable
reviewed by Richard
|
2009-10-14 01:51:49 +00:00 |
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 |
Nat Goodspeed
|
fcaa1ad46f
|
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
Boost.Signals2 like the rest of the event-system-n code.
|
2009-06-22 12:52:18 +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 |
Brad Kittenbrink
|
087bd26553
|
Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
2009-06-04 16:24:21 +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
|
e3b97ac65b
|
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
|
2008-03-20 21:41:26 +00:00 |
Steven Bennetts
|
672a76d0ea
|
reverting premature commit at 82410.
|
2008-03-15 01:18:27 +00:00 |
Mark Palange
|
04611efae8
|
[NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
|
2008-03-14 23:21:38 +00:00 |
Steven Bennetts
|
2e32d44e71
|
merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
|
2008-02-19 21:42:32 +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 |
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 |
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |