Merge remote-tracking branch 'origin/master'

2013-08-31 14:24:06 +02:00
parent 36fef0be7f 9295a4be19
commit 2d5c68835d
104 changed files with 3391 additions and 17541 deletions
@@ -43,7 +43,6 @@ INCLUDEPATH += . \
 	src/engine/local_engine \
 	src/engine/network_engine \
 	src/config \
-	src/third_party/asn1 \
 	src/gui/qt \
 	src/gui/qt/connecttoserverdialog \
 	src/core \
@@ -598,6 +597,7 @@ mac {
 	INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/
 	INCLUDEPATH += /Library/Frameworks/SDL.framework/Headers
 	INCLUDEPATH += /Library/Frameworks/SDL_mixer.framework/Headers
+	INCLUDEPATH += /usr/local/include
 }
 OTHER_FILES += docs/infomessage-id-desc.txt
 official_server {