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 |
|
Brad Kittenbrink
|
abdc99f21b
|
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
|
2009-02-18 21:10:16 +00:00 |
|
Jennifer Leech
|
fbf15572d9
|
svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme
|
2008-06-12 20:51:41 +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 |