Merge with develop
This commit is contained in:
commit
1cd9981139
2 changed files with 1 additions and 2 deletions
|
@ -139,8 +139,6 @@ moc_*.cpp
|
||||||
*.cache
|
*.cache
|
||||||
*.patch
|
*.patch
|
||||||
*.7z
|
*.7z
|
||||||
external
|
|
||||||
external_stlport
|
|
||||||
3rdParty
|
3rdParty
|
||||||
.svn
|
.svn
|
||||||
thumbs.db
|
thumbs.db
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue