summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-12 18:10:29 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-12 18:10:29 (GMT)
commit520833ec16ffd5c5448983e21dd5d96e8b8168f5 (patch)
treec67199b7c5f4f90b15f72eb1007ccf7c61bbff6e
parent283a6801fd11aeaf38b2298399c2bf622f743cf4 (diff)
downloadswift-520833ec16ffd5c5448983e21dd5d96e8b8168f5.zip
swift-520833ec16ffd5c5448983e21dd5d96e8b8168f5.tar.bz2
Temporarily remove Slimber building.
-rw-r--r--Slimber/CLI/SConscript2
-rw-r--r--Swiften/Application/Windows/WindowsApplication.h1
2 files changed, 1 insertions, 2 deletions
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_;
}