From 27da1e0e64fc9564122ab74a7dc776375259ea41 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Tue, 8 Dec 2015 17:50:01 +0100
Subject: [PATCH] Merge with develop

---
 .hgignore                                             | 2 --
 code/ryzom/tools/client/client_patcher/CMakeLists.txt | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.hgignore b/.hgignore
index 7892f93af..ab6152070 100644
--- a/.hgignore
+++ b/.hgignore
@@ -139,8 +139,6 @@ moc_*.cpp
 *.cache
 *.patch
 *.7z
-external
-external_stlport
 3rdParty
 .svn
 thumbs.db
diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt
index 70857105e..47178d456 100644
--- 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