Merge with develop

--HG-- branch : compatibility-develop
2015-12-08 17:50:01 +01:00 · 2015-12-08 17:50:01 +01:00 · b0b7e64936
commit b0b7e64936
parent b46dfe178f 1d00f974b6
2 changed files with 1 additions and 2 deletions
--- a/.hgignore
+++ b/.hgignore
@ -139,8 +139,6 @@ moc_*.cpp
 *.cache
 *.patch
 *.7z
-external
-external_stlport
 3rdParty
 .svn
 thumbs.db
--- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt
+++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
@ -1,5 +1,6 @@
 FILE(GLOB SRC main.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/login_patch.cpp
 	${CMAKE_SOURCE_DIR}/ryzom/client/src/login_xdelta.cpp