Merge with default

2013-07-25 21:18:52 +02:00 · 2013-07-25 21:18:52 +02:00 · 1fdde1e56d
commit 1fdde1e56d
parent b93ab158a5
2 changed files with 3 additions and 0 deletions
--- a/.hgeol
+++ b/.hgeol
@ -2,6 +2,9 @@
 **.h = native
 **.cpp = native
 
+**/database.xml = BIN
+**/msg.xml = BIN
+
 **.txt = native
 **.xml = native

--- a/code/nel/tools/3d/object_viewer_qt/src/images/nel_ide_load.png
+++ b/code/nel/tools/3d/object_viewer_qt/src/images/nel_ide_load.png