Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	gamefiles/TEXT/american.gxt
#	premake5.lua
#	src/audio/MusicManager.cpp
#	src/control/Darkel.cpp
#	src/control/Script.cpp
#	src/core/FileLoader.cpp
#	src/core/Frontend.cpp
#	src/core/Game.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/extras/frontendoption.cpp
#	src/extras/frontendoption.h
#	src/render/Hud.cpp
#	src/skel/glfw/glfw.cpp
#	src/vehicles/CarGen.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/WeaponInfo.cpp
#	utils/gxt/american.txt

1 files changed, 1 insertions, 1 deletions

diff --git a/premake5.lua b/premake5.lua
index fb408fe0..334c9c53 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -185,7 +185,7 @@ project "librw"
 		includedirs {"/usr/local/include" }
 		libdirs { "/opt/local/lib" }
 		libdirs { "/usr/local/lib" }
-
+	
 	filter "platforms:*RW34*"
 		flags { "ExcludeFromBuild" }
 	filter  {}