From b7c3ffd37cfe10b45976b3e7fb4a595350ef7734 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Thu, 14 Jun 2012 03:12:48 +0200
Subject: BASE: Add operator* to PluginSubclass.

---
 base/plugins.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'base')

diff --git a/base/plugins.h b/base/plugins.h
index fffb5fb910..4409c9eaea 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -205,6 +205,10 @@ typedef Common::Array<Plugin *> PluginList;
 template<class PO_t>
 class PluginSubclass : public Plugin {
 public:
+	PO_t &operator*() const {
+		return *(PO_t *)_pluginObject;
+	}
+
 	PO_t *operator->() const {
 		return (PO_t *)_pluginObject;
 	}
-- 
cgit v1.2.3


From e2056bdfd93ba247c819ec3fd2f0b487dde05709 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Fri, 29 Jun 2012 16:09:28 +0200
Subject: GUI: Remember last save/load chooser selection.

---
 base/commandLine.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'base')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 6fd020cb15..5ad23313dc 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -237,6 +237,8 @@ void registerDefaults() {
 	ConfMan.registerDefault("record_temp_file_name", "record.tmp");
 	ConfMan.registerDefault("record_time_file_name", "record.time");
 
+	ConfMan.registerDefault("gui_saveload_chooser", "grid");
+
 }
 
 //
-- 
cgit v1.2.3


From 6387e3bca73dd8b2dacab15a84a4a3b8d6c13c10 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 8 Jul 2012 22:30:05 +0300
Subject: RELEASE: This is 1.6.0git

---
 base/internal_version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/internal_version.h b/base/internal_version.h
index 5392012169..40ed67ceec 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,4 +16,4 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.5.0git" SCUMMVM_REVISION
+#define SCUMMVM_VERSION "1.6.0git" SCUMMVM_REVISION
-- 
cgit v1.2.3