summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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_;
}