From 520833ec16ffd5c5448983e21dd5d96e8b8168f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Wed, 12 Aug 2009 20:10:29 +0200
Subject: Temporarily remove Slimber building.


diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index b65843d..56c98fd 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -5,4 +5,4 @@ myenv.MergeFlags(env["SLIMBER_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
 
-myenv.Program("slimber", ["main.cpp"])
+#myenv.Program("slimber", ["main.cpp"])
diff --git a/Swiften/Application/Windows/WindowsApplication.h b/Swiften/Application/Windows/WindowsApplication.h
index e78942a..d31691c 100644
--- a/Swiften/Application/Windows/WindowsApplication.h
+++ b/Swiften/Application/Windows/WindowsApplication.h
@@ -10,7 +10,6 @@ namespace Swift {
 			WindowsApplication(const String& name) : Application(name) {
 			}
 
-		protected:
 			virtual ApplicationMessageDisplay* getApplicationMessageDisplay() {
 				return  &messageDisplay_;
 			}
-- 
cgit v0.10.2-6-g49f6