livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/cmake
History
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 		2009-05-04 17:43:26 +00:00
..
00-Common.cmake svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 2009-04-30 06:52:38 +00:00
APR.cmake svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 2009-04-30 06:52:38 +00:00
Audio.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
BerkeleyDB.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
Boost.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
BuildVersion.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
CARes.cmake Remainder of CMake 2.6.0 compatibility fixes. CMake 2.4.7/2.4.8 or 2.6.0 can now be used for Mac builds. 2008-07-26 22:56:53 +00:00
CMakeCopyIfDifferent.cmake Fixes the the copy-win-scripts related cmake files to make the copy_win_scripts target function properly. 2008-06-13 16:52:59 +00:00
CMakeLists.txt svn merge -r113780:113785 2009-03-09 23:42:07 +00:00
CSharpMacros.cmake svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
CURL.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
CopyBackToSource.cmake svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
DBusGlib.cmake QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
DirectX.cmake Added search path for Microsoft DirectX SDK (August 2008), the latest version. OK by Ambroff. 2008-10-29 07:01:11 +00:00
ELFIO.cmake QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
EXPAT.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
FMOD.cmake DEV-18513 - Don't fail if we have no debug FMOD libraries 2008-07-31 17:21:46 +00:00
FindAPR.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindBerkeleyDB.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindCARes.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindELFIO.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindGooglePerfTools.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindMT.cmake QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge 2008-11-19 23:26:29 +00:00
FindMono.cmake DEV-19146 / Don't hard-code Windows paths. 2008-09-24 00:07:45 +00:00
FindMySQL.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindOpenJPEG.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FindSCP.cmake Fix for windows + develop.py: Use pscp on windows instead of scp. 2008-07-03 18:15:16 +00:00
FindXmlRpcEpi.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
FreeType.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
GooglePerfTools.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
JPEG.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
LLAddBuildTest.cmake svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 2009-03-20 20:00:47 +00:00
LLAudio.cmake QAR-1040 maint-viewer-11 + OpenAL combo mergeme 2008-12-02 20:35:40 +00:00
LLCharacter.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLCommon.cmake Use target_link_libraries for llcommon 2008-08-29 21:18:49 +00:00
LLCrashLogger.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLDatabase.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLImage.cmake Switch llimage and llxml to target_link_libraries 2008-08-29 21:46:30 +00:00
LLImageJ2COJ.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLInventory.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLKDU.cmake svn merge -r99056:99248 svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge 2008-10-10 16:04:02 +00:00
LLMath.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLMessage.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLPrimitive.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLRender.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
LLScene.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLUI.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLVFS.cmake Switch more libraries over to target_link_libraries 2008-08-29 22:16:44 +00:00
LLWindow.cmake Retry. Build system fixes for library-library dependencies, ported from skinning-7. OK by CG. 2009-04-20 16:24:21 +00:00
LLXML.cmake Switch llimage and llxml to target_link_libraries 2008-08-29 21:46:30 +00:00
LScript.cmake svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
Linking.cmake Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 2009-02-18 21:10:16 +00:00
MonoDeps.cmake svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated 2008-07-31 12:15:15 +00:00
MonoEmbed.cmake If we need Mono, but don't find it, then fail early 2008-07-31 17:45:03 +00:00
MySQL.cmake svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 2009-04-30 06:52:38 +00:00
NDOF.cmake svn merge -c102054 2008-11-12 20:28:24 +00:00
OPENAL.cmake Revert one openal -> openal-soft replacement - reviewed by Moss 2008-12-22 18:59:09 +00:00
OpenGL.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
OpenJPEG.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
OpenSSL.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
PNG.cmake QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
Prebuilt.cmake CMake updates: 2008-07-26 18:21:31 +00:00
Python.cmake Allow use of Python 2.6, in case it's useful for OSS builds. 2008-10-28 23:18:16 +00:00
TemplateCheck.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
Tut.cmake Clean up use of tut 2009-03-02 22:28:49 +00:00
UI.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
UnixInstall.cmake svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 2008-06-02 21:14:31 +00:00
Variables.cmake svn merge -r118008:118374 svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1 2009-04-30 06:52:38 +00:00
ViewerMiscLibs.cmake QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 2009-02-03 17:56:26 +00:00
XmlRpcEpi.cmake svn merge -r89258:89534 svn+ssh://svn/svn/linden/branches/install-dev-binaries/idb2-merge-buildme 2008-06-12 20:51:41 +00:00
ZLIB.cmake QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 2009-05-04 17:43:26 +00:00
cmake_dummy.cpp 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