Enno Rehling 5b9333f6d9 Merge branch 'release-3.7' into develop ... Conflicts: src/buildno.h src/monsters.c		2015-11-23 17:12:48 +01:00
..
catalog.xml	libxml 1.9.x seems to be a bit pickier about how XML catalogs are written.	2015-06-08 16:51:41 +02:00
config.json	Merge branch 'release-3.7' into develop	2015-11-23 17:12:48 +01:00
config.xml	remove the game section from XML config	2015-09-12 18:15:36 +02:00