Merge from Git repository
--HG-- branch : develop
This commit is contained in:
commit
37ce82dc13
1 changed files with 3 additions and 2 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -216,6 +216,7 @@ code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service
|
|||
code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service
|
||||
code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
|
||||
code/ryzom/server/src/tick_service/tick_service
|
||||
|
||||
# WebTT temp dir
|
||||
code/ryzom/tools/server/www/webtt/app/tmp
|
||||
|
||||
|
@ -236,13 +237,13 @@ code/ryzom/tools/server/ryzom_ams/old
|
|||
|
||||
|
||||
|
||||
#tools and external dir's
|
||||
# Tools and external directories
|
||||
external
|
||||
external_stlport
|
||||
nel_tools*
|
||||
ryzom_tools*
|
||||
|
||||
#Dumps
|
||||
# Dumps
|
||||
*.dmp
|
||||
|
||||
code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
|
||||
|
|
Loading…
Reference in a new issue