Adam Moss
|
d999da2072
|
DEV-41407 resurrect and fix LLControlGroup test, convert it to a llxml integration test.
|
2009-10-16 13:28:31 +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 |
|
James Cook
|
9b2d9c6e6e
|
Retry. Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
|
2009-04-20 16:24:21 +00:00 |
|
James Cook
|
5c2fd1e4fe
|
Back out last commit, because it breaks mapserver build on linux, dammit.
|
2009-04-17 22:00:04 +00:00 |
|
James Cook
|
57b47705d7
|
Build system fixes for library-library dependencies, ported from skinning-7. OK by CG.
svn merge -r117623:117624 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-7
|
2009-04-17 20:39:07 +00:00 |
|
Dave Simmons
|
24b26d71ee
|
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
2009-03-20 20:00:47 +00:00 |
|
Bryan O'Sullivan
|
1496c3d0ee
|
Switch llimage and llxml to target_link_libraries
|
2008-08-29 21:46:30 +00:00 |
|
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 |