Bryan O'Sullivan
|
9db949eec3
|
svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
2008-06-02 21:14:31 +00:00 |
|
Don Kjer
|
0a7265b1cc
|
svn merge -r 75234:75235 svn+ssh://svn/svn/linden/branches/maintenance-5 into release
Fix for simulator crash (null pointer dereference during lldebugs)
|
2007-12-06 20:32:46 +00:00 |
|
Aaron Brashears
|
45057e8881
|
removed use of typeid()
|
2007-12-05 18:27:07 +00:00 |
|
Aaron Brashears
|
2a9be0445b
|
Result of svn merge -r74235:74242 svn+ssh://svn/svn/linden/branches/robust-pump into release
|
2007-12-05 01:15:45 +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 |
|
Don Kjer
|
13c391f198
|
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
|
2007-09-14 21:13:20 +00:00 |
|
Don Kjer
|
4ecb9cb63e
|
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
|
2007-05-01 21:39:25 +00:00 |
|
Josh Bell
|
c93c38e047
|
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
|
2007-03-21 19:36:11 +00:00 |
|
Steven Bennetts
|
4dabd9c047
|
merge release@58699 beta-1-14-0@58707 -> release
|
2007-03-02 21:25:50 +00:00 |
|
Steven Bennetts
|
7f50e28b0f
|
merge -r 56842:57026 maintenance.
|
2007-01-23 19:12:31 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |