Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2015-12-08 17:50:01 +01:00
commit b0b7e64936
2 changed files with 1 additions and 2 deletions

View file

@ -139,8 +139,6 @@ moc_*.cpp
*.cache *.cache
*.patch *.patch
*.7z *.7z
external
external_stlport
3rdParty 3rdParty
.svn .svn
thumbs.db thumbs.db

View file

@ -1,5 +1,6 @@
FILE(GLOB SRC main.cpp FILE(GLOB SRC main.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/app_bundle_utils.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/user_agent.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/client_cfg.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_patch.cpp
${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp ${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp