From f9868c807d5f9a39637db45eec9b0248cb8f8de5 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 5 May 2011 17:43:33 +0200
Subject: BASE: Suppress pointless warning message (fixes bug #3291522)

---
 base/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/main.cpp b/base/main.cpp
index fc4523b895..b34eb6966a 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -354,7 +354,8 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 	// TODO: deal with settings that require plugins to be loaded
 	res = Base::processSettings(command, settings);
 	if (res.getCode() != Common::kArgumentNotProcessed) {
-		warning("%s", res.getDesc().c_str());
+		if (res.getCode() != Common::kNoError)
+			warning("%s", res.getDesc().c_str());
 		return res.getCode();
 	}
 
-- 
cgit v1.2.3


From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 base/commandLine.cpp | 3 ---
 base/commandLine.h   | 3 ---
 base/main.cpp        | 3 ---
 base/main.h          | 3 ---
 base/plugins.cpp     | 3 ---
 base/plugins.h       | 3 ---
 base/version.cpp     | 3 ---
 base/version.h       | 3 ---
 8 files changed, 24 deletions(-)

(limited to 'base')

diff --git a/base/commandLine.cpp b/base/commandLine.cpp
index 05e1d2c131..1ca4a642c8 100644
--- a/base/commandLine.cpp
+++ b/base/commandLine.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // FIXME: Avoid using printf
diff --git a/base/commandLine.h b/base/commandLine.h
index 6205c914e0..4e611d97bf 100644
--- a/base/commandLine.h
+++ b/base/commandLine.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef COMMON_COMMAND_LINE_H
diff --git a/base/main.cpp b/base/main.cpp
index b34eb6966a..4ed70a5587 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /*! \mainpage %ScummVM Source Reference
diff --git a/base/main.h b/base/main.h
index 93e73f55e6..3d75931454 100644
--- a/base/main.h
+++ b/base/main.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef BASE_MAIN_H
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 38b5626fe2..56bb1e63e5 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "base/plugins.h"
diff --git a/base/plugins.h b/base/plugins.h
index d8f1cb96ee..247564171d 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef BASE_PLUGINS_H
diff --git a/base/version.cpp b/base/version.cpp
index 6967263f5c..6a670c1a40 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/scummsys.h"
diff --git a/base/version.h b/base/version.h
index 1ad6d48b8b..a5c25c03f4 100644
--- a/base/version.h
+++ b/base/version.h
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #ifndef BASE_VERSION_H
-- 
cgit v1.2.3


From 5c34e33c2c27b2b5083199b40306370d732f4e53 Mon Sep 17 00:00:00 2001
From: athrxx
Date: Fri, 29 Apr 2011 22:16:02 +0200
Subject: FM-TOWNS AUDIO: Some more midi driver code for FM-TOWNS monkey2 and
 indy4

---
 base/plugins.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'base')

diff --git a/base/plugins.cpp b/base/plugins.cpp
index 56bb1e63e5..4a3b201714 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -225,6 +225,7 @@ public:
 		LINK_PLUGIN(AMIGA)
 		LINK_PLUGIN(APPLEIIGS)
 		LINK_PLUGIN(TOWNS)
+		LINK_PLUGIN(PC98)
 		#if defined(USE_TIMIDITY)
 		LINK_PLUGIN(TIMIDITY)
 		#endif
-- 
cgit v1.2.3