Mark Palange (Mani)
|
69c3caa24f
|
EXT-6880 Adding newline to end of CMakesList.txt
|
2010-04-16 16:38:16 -07:00 |
|
Mark Palange (Mani)
|
afea42507c
|
EXT-6880 Building updater with static linked CRT
|
2010-04-16 16:26:20 -07:00 |
|
palange
|
ec32310c86
|
Removed search_dirs and dst_path arguments from ll_deploy_sharedlibs_command()
Fixed mac breakage.
|
2009-11-05 17:51:50 -08:00 |
|
Mark Palange (Mani)
|
9e69702fe7
|
Added calls to ll_deploy_sharedlibs_command
Using viewer_manifest.py for windows dependency deployment during build.
Added SHARED_LIBS_REL_PATH var to cmake cache.
|
2009-11-05 08:52:07 -08:00 |
|
Adam Moss
|
9dfe0ca9a0
|
svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
|
2009-05-22 09:58:47 +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 |
|
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 |
|
Adam Moss
|
fd46865a50
|
QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
|
2008-12-02 20:35:40 +00:00 |
|
James Cook
|
b406972af1
|
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
|
2008-10-28 23:56:20 +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 |
|
Don Kjer
|
facf67ae32
|
EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
|
2007-12-05 23:43:56 +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 |
|
Aaron Brashears
|
4942a7b779
|
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
|
2007-10-04 16:31:48 +00:00 |
|
Aaron Brashears
|
f118e7c80b
|
result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release
|
2007-06-13 18:02:37 +00:00 |
|
Anthony Foster
|
61324a18b9
|
Removing a bug that addressed a coverity defect. This change is done in maintenance, r-c, and release. Maintenance r63092 Reviewed by Richard.
|
2007-06-05 22:41:07 +00:00 |
|
Kelly Washington
|
3e9872a297
|
merge -r61423:62602 svn/branches/maintenance --> release
|
2007-05-30 17:39:09 +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 |
|
Karen Clark
|
fceae96eb1
|
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
|
2007-03-20 22:21:42 +00:00 |
|
Steven Bennetts
|
068558f888
|
merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8)
Reviewed by Rob
|
2007-03-07 02:48:44 +00:00 |
|
Aaron Brashears
|
305c74d516
|
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
|
2007-02-02 17:28:58 +00:00 |
|
James Cook
|
420b91db29
|
Print done when done.
|
2007-01-02 08:33:20 +00:00 |