From e33eb48ad04270772df3ec15920f36141d274076 Mon Sep 17 00:00:00 2001
From: Olivier Galibert <galibert@pobox.com>
Date: Mon, 24 Oct 2016 10:42:30 +0200
Subject: [PATCH 1/4] SDL: fixed alt-tab from locking up the window system on
 Linux and Mac. [Hans Ostermeyer]

---
 src/osd/sdl/window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 38cef1d496c..48c811f4cf1 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -298,7 +298,7 @@ void sdl_window_info::toggle_full_screen()
 	machine().ui().menu_reset();
 	// kill off the drawers
 	renderer_reset();
-	set_platform_window(nullptr);
+//	set_platform_window(nullptr);
 	bool is_osx = false;
 #ifdef SDLMAME_MACOSX
 	// FIXME: This is weird behaviour and certainly a bug in SDL

From 31127f8613f84e3f023c5294d748b90a65526766 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Mon, 24 Oct 2016 18:26:10 +0200
Subject: [PATCH 2/4] Fixed linking warning for ASIO (nw)

---
 src/osd/asio.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/osd/asio.h b/src/osd/asio.h
index 67efe07acda..cde767edee3 100644
--- a/src/osd/asio.h
+++ b/src/osd/asio.h
@@ -17,7 +17,6 @@
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #endif
 
-#define ASIO_HEADER_ONLY
 #define ASIO_STANDALONE
 #define ASIO_SEPARATE_COMPILATION
 #define ASIO_NOEXCEPT noexcept(true)

From 32b7e58d94132faf219b4067fcc2f84eddea7450 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Wed, 26 Oct 2016 10:45:58 +1100
Subject: [PATCH 3/4] Version bump!

---
 android-project/app/src/main/AndroidManifest.xml | 4 ++--
 makefile                                         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 1feb29a11d8..4ab4f0b722d 100644
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="178"
-      android:versionName="0.178"
+      android:versionCode="179"
+      android:versionName="0.179"
       android:installLocation="auto">
 
     <!-- Android 4.0 -->
diff --git a/makefile b/makefile
index e18a5817a02..fbdcf366928 100644
--- a/makefile
+++ b/makefile
@@ -1464,14 +1464,14 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.178"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.179"' > $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char build_version[];' >> $@
 	@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
 	@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
 else
 $(GENDIR)/version.cpp: $(GENDIR)/git_desc
-	@echo #define BARE_BUILD_VERSION "0.178" > $@
+	@echo #define BARE_BUILD_VERSION "0.179" > $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char build_version[]; >> $@
 	@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

From d9c5fcaf6d422f39b4ff34f7732cbfa3dd21b116 Mon Sep 17 00:00:00 2001
From: Vas Crabb <vas@vastheman.com>
Date: Wed, 26 Oct 2016 10:47:23 +1100
Subject: [PATCH 4/4] final srcclean

---
 src/osd/sdl/window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp
index 48c811f4cf1..a19b3b61dec 100644
--- a/src/osd/sdl/window.cpp
+++ b/src/osd/sdl/window.cpp
@@ -298,7 +298,7 @@ void sdl_window_info::toggle_full_screen()
 	machine().ui().menu_reset();
 	// kill off the drawers
 	renderer_reset();
-//	set_platform_window(nullptr);
+//  set_platform_window(nullptr);
 	bool is_osx = false;
 #ifdef SDLMAME_MACOSX
 	// FIXME: This is weird behaviour and certainly a bug in SDL