diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-06-09 20:38:38 +0200 |
| commit | 7f4410f9d5dce2884368a4b1d01139abd2e65fd5 (patch) | |
| tree | e4f6cd0f6ed40b1852fa5ce28a5d78be982b0a73 /GNUmakefile | |
| parent | 8ac35610a416d3937ccf4b3b74a61622382e8162 (diff) | |
| parent | fa2ffc29c1ef2c33ff0a9c1baf7026a4d9ffe0b6 (diff) | |
| download | serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.gz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.bz2 serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.tar.xz serverdata-7f4410f9d5dce2884368a4b1d01139abd2e65fd5.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 508cfea2..d08a2409 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -23,7 +23,7 @@ indent-items: tools/aligncsv indent-mobs: tools/aligncsv tools/aligncsv world/map/db/mob_db.txt -world/map/news.txt world/map/news.html: tools/news.py tools/_news_colors.py world/map/news.d/* +world/map/news.txt world/map/news.html: tools/news.py tools/_news_colors.py world/map/news.d/* world/map/news.d/ tools/news.py world/map/ world/map/news.d/ news: world/map/news.txt world/map/news.html |