Enno Rehling 5befbad7c7 Merge branch 'version-3-1' ... Conflicts: src/laws.c		2014-08-24 00:30:12 +02:00
..
armor	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
common	Revert "silver has a weight of 1: http://bugs.eressea.de/view.php?id=2013"	2014-08-22 20:15:44 +02:00
de	Repair MAKE, which broke when I changed MAKE TEMP.	2014-08-21 07:31:28 +02:00
en	fix MAKE TEMP, for real this time. I hate skip_token and all that stuff.	2014-08-23 00:37:33 +02:00
fr	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
resources	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spellbooks	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
weapons	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
calendar.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
messages.xml	Merge branch 'master' of github.com:eressea/server	2014-08-17 12:15:26 +02:00
prefixes.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
ships.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spells.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
spoils.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00
terrains.xml	removing the core directory (moving to res and scripts).	2014-07-28 14:27:30 +02:00