From ad7cd9f23b24c3cf2fd1ca6f03511490aebabf03 Mon Sep 17 00:00:00 2001 From: Tobias Peters Date: Tue, 8 Dec 2015 17:20:38 +0100 Subject: [PATCH 1/2] removed duplicated ignores --- .hgignore | 2 -- 1 file changed, 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 From 583035ff3d8a626d2ae423a4271051e0fd5fbe2e Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 8 Dec 2015 17:49:23 +0100 Subject: [PATCH 2/2] Fixed: ryzom_client_patcher compilation --- code/ryzom/tools/client/client_patcher/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) 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