Merge from Git repository

--HG--
branch : develop
This commit is contained in:
NO-BREAK SPACE OÜ 2018-08-20 12:19:31 +00:00
commit 37ce82dc13

3
.gitignore vendored
View file

@ -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,7 +237,7 @@ code/ryzom/tools/server/ryzom_ams/old
#tools and external dir's
# Tools and external directories
external
external_stlport
nel_tools*