Merge branch 'aethyra/master'

Conflicts:
	docs/FAQ.txt
	packaging/windows/make-translations.vbs
	src/Makefile.am
	src/gui/colour.cpp
	src/gui/colour.h
	src/gui/popupmenu.cpp
	src/gui/setup_colours.h
	src/main.cpp
	src/main.h
	src/resources/resourcemanager.cpp
	src/text.cpp
	src/text.h
	src/textmanager.cpp
	src/textmanager.h

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main.h b/src/main.h
index 0e884fb2..5a337d15 100644
--- a/src/main.h
+++ b/src/main.h
@@ -30,8 +30,8 @@
 #include "winver.h"
 #endif
 
-#ifndef TMW_DATADIR
-#define TMW_DATADIR ""
+#ifndef PKG_DATADIR
+#define PKG_DATADIR ""
 #endif
 
 /*