Merge branch 'master' into enhanced_viewport_overlay

Conflicts: src/road_gui.cpp src/widgets/dropdown.cpp
2015-08-11 21:41:41 +01:00
parent 5540374227 f4cd0198f4
commit 388dab7390
78 changed files with 6613 additions and 622 deletions
--- a/src/stdafx.h
+++ b/src/stdafx.h
@@ -223,7 +223,9 @@

 	#include <malloc.h> // alloca()
 	#define NORETURN __declspec(noreturn)
-	#define inline __forceinline
+	#if (_MSC_VER < 1900)
+		#define inline __forceinline
+	#endif

 	#if !defined(WINCE)
 		#define CDECL _cdecl