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 |
|
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 |
|
Josh Bell
|
a10f963900
|
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
|
2008-03-04 16:59:57 +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 |
|
Josh Bell
|
6fa974fc64
|
svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-08 00:25:12 +00:00 |
|
Steven Bennetts
|
d1582a5105
|
merge -r 57111:57464 maintenance.
|
2007-02-05 20:20:42 +00:00 |
|
Steven Bennetts
|
7f50e28b0f
|
merge -r 56842:57026 maintenance.
|
2007-01-23 19:12:31 +00:00 |
|
Josh Bell
|
8c344f4da0
|
svn merge -r 56560:56599 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
|
2007-01-09 20:19:31 +00:00 |
|
Josh Bell
|
d60f16540d
|
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431
This turned up the following "lost" changes:
llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
llfontgl.cpp (from maintenance r50207) - whitespace only
inventorybridge.cpp (property - non-executable)
skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
|
2007-01-04 02:04:29 +00:00 |
|
Aaron Brashears
|
4617a37edf
|
corrected, removed, and updated comments throughout the code to be more useful. no code changes. SL-13762
|
2007-01-03 21:05:41 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |