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