Enno Rehling 2b596b40f6 Merge branch 'master' of github.com:eressea/server		2014-11-02 10:40:49 +01:00
..
e2	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00
e3	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00
e4	read keywords from json configuration, use German imperative forms.	2014-10-29 19:40:09 +01:00
eressea.ini	fix segmentation fault in new assert (units without a faction)	2014-10-31 22:20:07 +01:00
keywords.json	Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot	2014-11-02 10:02:30 +01:00