Commit Graph

6 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
kaetemi 6417fae7bd EOL
--HG--
branch : hotfix
10 years ago
kaetemi de449a90a0 Merge with default
--HG--
branch : build_pipeline_v3
11 years ago
kaetemi 55a00fd518 Don't do EOL changes for database.xml and msg.xml, causes checksum difference 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