7 commits

Author	SHA1	Message	Date
Steffen Mecke	c5014fd766	integrated Ennos suggestions for dragon growls ... Dragons now growl 20% more elegantly!	2016-06-11 13:47:38 +02:00
Enno Rehling	5535beed61	Merge branch 'master' into develop ... Conflicts: src/buildno.h src/kernel/save.c	2016-05-29 11:13:19 +02:00
Enno Rehling	72d9f8adf0	For NMR purposes, count cursed factions like NPCs (i.e. not). ... fix warnings in log tests log whitespace cleanup	2016-05-29 10:58:49 +02:00
Enno Rehling	cdd7606f02	fixing the password saving test.	2016-05-20 22:38:18 +02:00
Enno Rehling	80716d0787	fix key-upgrade function (coverity CID 102076) ... fix MSVC warning (strncpy)	2016-05-02 19:22:57 +02:00
Enno Rehling	c4d31d368e	Merge branch 'master' into develop ... Conflicts: src/buildno.h src/util/log.c src/util/log.h	2016-05-01 13:47:30 +02:00
Enno Rehling	1fa1693119	test multiple loggers	2016-05-01 13:36:00 +02:00