Commit Graph

9 Commits (b8b71cf89004352fa3ce726db1f570210989d4ee)

Author SHA1 Message Date
kaetemi ed06500c86 Merge branch 'develop' into feature/build-pipeline-v3
# Conflicts:
#	code/nel/src/misc/displayer.cpp
#	code/nel/tools/3d/plugin_max/nel_export/nel_export_export.cpp
#	code/nel/tools/3d/plugin_max/nel_export/nel_export_script.cpp
#	code/nel/tools/3d/tga_2_dds/tga2dds.cpp
#	code/nel/tools/CMakeLists.txt
#	code/nel/tools/misc/bnp_make/main.cpp
6 years ago
kervala 575f58d749 Changed: Synchonized some changes from compatibility-develop branch
--HG--
branch : develop
7 years ago
kaetemi 1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 11 years ago
kaetemi 562dae3c3f Add command to eternally trap players ingame 11 years ago
kaetemi 91a8acfd72 Merge with default
--HG--
branch : build_pipeline_v3
12 years ago
kervala 45c8b20f39 Changed: Typo fixes (thanks to Vagrant!) 12 years ago
kaetemi a46cbdc332 Changed: Don't do EOL changes for database.xml and msg.xml
--HG--
branch : build_pipeline_v3
13 years ago
sfb af454dd1cf Fixed EOL issues and added .hgeol file. 13 years ago
acemtp@users.sourceforge.net d5c601ffa5 initial version 15 years ago