aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2015-01-03 13:07:34 (GMT)
committerMathias Gumz <akira@fluxbox.org>2015-01-03 13:07:34 (GMT)
commit376ed523cb84bdc5314aaebdb39502e0e0fd9701 (patch)
treeeac5e634df167f8132786469d2ccf3b71a8f61a9 /src
parent354e59f547f034a9e73c4a2f09713f32935e2949 (diff)
downloadfluxbox-376ed523cb84bdc5314aaebdb39502e0e0fd9701.zip
fluxbox-376ed523cb84bdc5314aaebdb39502e0e0fd9701.tar.bz2
Update release version
Diffstat (limited to 'src')
-rw-r--r--src/cli_options.cc2
-rw-r--r--src/main.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/cli_options.cc b/src/cli_options.cc
index 1455ea1..6b24c22 100644
--- a/src/cli_options.cc
+++ b/src/cli_options.cc
@@ -137,7 +137,7 @@ int FluxboxCli::Options::parse(int argc, char** argv) {
137 "-help\t\t\t\tdisplay this help text and exit.\n\n", 137 "-help\t\t\t\tdisplay this help text and exit.\n\n",
138 138
139 "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(), 139 "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(),
140 __fluxbox_version, "2001-2014"); 140 __fluxbox_version, "2001-2015");
141 return EXIT_SUCCESS; 141 return EXIT_SUCCESS;
142 } else if (arg == "-info" || arg == "-i" || arg == "--info") { 142 } else if (arg == "-info" || arg == "-i" || arg == "--info") {
143 FluxboxCli::showInfo(cout); 143 FluxboxCli::showInfo(cout);
diff --git a/src/main.cc b/src/main.cc
index bff3be6..92d04ce 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,6 +53,10 @@
53#include <sys/wait.h> 53#include <sys/wait.h>
54#endif // HAVE_SYS_WAIT_H 54#endif // HAVE_SYS_WAIT_H
55 55
56#ifdef HAVE_SIGNAL_H
57#include <signal.h>
58#endif
59
56 60
57#include <iostream> 61#include <iostream>
58#include <stdexcept> 62#include <stdexcept>