diff options
-rw-r--r-- | doc/asciidoc/fbrun.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fbsetbg.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fbsetroot.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fluxbox-apps.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fluxbox-keys.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fluxbox-remote.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fluxbox-style.txt | 2 | ||||
-rw-r--r-- | doc/asciidoc/fluxbox.txt | 2 | ||||
-rw-r--r-- | src/cli_options.cc | 2 | ||||
-rw-r--r-- | src/main.cc | 4 | ||||
-rw-r--r-- | util/fbrun/main.cc | 2 | ||||
-rw-r--r-- | util/fbsetroot.cc | 2 |
12 files changed, 15 insertions, 11 deletions
diff --git a/doc/asciidoc/fbrun.txt b/doc/asciidoc/fbrun.txt index 8ae75d0..c690f8c 100644 --- a/doc/asciidoc/fbrun.txt +++ b/doc/asciidoc/fbrun.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fbrun(1) | 1 | fbrun(1) |
2 | ======== | 2 | ======== |
3 | Jim Ramsay <i.am@jimramsay.com> | 3 | Jim Ramsay <i.am@jimramsay.com> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fbrun.txt | 5 | :man source: fbrun.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fbsetbg.txt b/doc/asciidoc/fbsetbg.txt index 5c6510a..c50f00b 100644 --- a/doc/asciidoc/fbsetbg.txt +++ b/doc/asciidoc/fbsetbg.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fbsetbg(1) | 1 | fbsetbg(1) |
2 | ========== | 2 | ========== |
3 | Jim Ramsay <i.am@jimramsay.com> | 3 | Jim Ramsay <i.am@jimramsay.com> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fbsetbg.txt | 5 | :man source: fbsetbg.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fbsetroot.txt b/doc/asciidoc/fbsetroot.txt index 7461ee7..73ba16b 100644 --- a/doc/asciidoc/fbsetroot.txt +++ b/doc/asciidoc/fbsetroot.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fbsetroot(1) | 1 | fbsetroot(1) |
2 | ============ | 2 | ============ |
3 | Jim Ramsay <i.am@jimramsay.com> | 3 | Jim Ramsay <i.am@jimramsay.com> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fbsetroot.txt | 5 | :man source: fbsetroot.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt index 4269478..c4164cc 100644 --- a/doc/asciidoc/fluxbox-apps.txt +++ b/doc/asciidoc/fluxbox-apps.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fluxbox-apps(5) | 1 | fluxbox-apps(5) |
2 | =============== | 2 | =============== |
3 | Jim Ramsay <i.am@jimramsay.com> | 3 | Jim Ramsay <i.am@jimramsay.com> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fluxbox-apps.txt | 5 | :man source: fluxbox-apps.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt index 4d92c43..6c5f951 100644 --- a/doc/asciidoc/fluxbox-keys.txt +++ b/doc/asciidoc/fluxbox-keys.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fluxbox-keys(5) | 1 | fluxbox-keys(5) |
2 | =============== | 2 | =============== |
3 | Jim Ramsay <i.am@jimramsay.com> | 3 | Jim Ramsay <i.am@jimramsay.com> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fluxbox-keys.txt | 5 | :man source: fluxbox-keys.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fluxbox-remote.txt b/doc/asciidoc/fluxbox-remote.txt index d524c27..b86ad8f 100644 --- a/doc/asciidoc/fluxbox-remote.txt +++ b/doc/asciidoc/fluxbox-remote.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fluxbox-remote(1) | 1 | fluxbox-remote(1) |
2 | ================= | 2 | ================= |
3 | Mark Tiefenbruck <mark@fluxbox.org> | 3 | Mark Tiefenbruck <mark@fluxbox.org> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 February 2015 |
5 | :man source: fluxbox-remote.txt | 5 | :man source: fluxbox-remote.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt index 290341f..f70ed16 100644 --- a/doc/asciidoc/fluxbox-style.txt +++ b/doc/asciidoc/fluxbox-style.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fluxbox-style(5) | 1 | fluxbox-style(5) |
2 | ================ | 2 | ================ |
3 | Henrik Kinnunen <fluxgen@fluxbox.org> | 3 | Henrik Kinnunen <fluxgen@fluxbox.org> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fluxbox-style.txt | 5 | :man source: fluxbox-style.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt index c2e4815..23a73d9 100644 --- a/doc/asciidoc/fluxbox.txt +++ b/doc/asciidoc/fluxbox.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | fluxbox(1) | 1 | fluxbox(1) |
2 | ========== | 2 | ========== |
3 | Henrik Kinnunen <fluxgen@fluxbox.org> | 3 | Henrik Kinnunen <fluxgen@fluxbox.org> |
4 | v1.3.5, 13 February 2013 | 4 | v1.3.6, 03 January 2015 |
5 | :man source: fluxbox.txt | 5 | :man source: fluxbox.txt |
6 | :man version: {revision} | 6 | :man version: {revision} |
7 | :man manual: Fluxbox Manual | 7 | :man manual: Fluxbox Manual |
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> |
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc index ba2d09d..13da81a 100644 --- a/util/fbrun/main.cc +++ b/util/fbrun/main.cc | |||
@@ -48,7 +48,7 @@ using std::endl; | |||
48 | using std::string; | 48 | using std::string; |
49 | 49 | ||
50 | void showUsage(const char *progname) { | 50 | void showUsage(const char *progname) { |
51 | cerr<<"fbrun 1.5 : (c) 2002-2014 Henrik Kinnunen"<<endl; | 51 | cerr<<"fbrun 1.5 : (c) 2002-2015 Henrik Kinnunen"<<endl; |
52 | cerr<<"Usage: "<< | 52 | cerr<<"Usage: "<< |
53 | progname<<" [arguments]"<<endl<< | 53 | progname<<" [arguments]"<<endl<< |
54 | "Arguments: "<<endl<< | 54 | "Arguments: "<<endl<< |
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc index 3a2f2b9..c787619 100644 --- a/util/fbsetroot.cc +++ b/util/fbsetroot.cc | |||
@@ -360,7 +360,7 @@ void fbsetroot::gradient() { | |||
360 | */ | 360 | */ |
361 | void fbsetroot::usage(int exit_code) { | 361 | void fbsetroot::usage(int exit_code) { |
362 | _FB_USES_NLS; | 362 | _FB_USES_NLS; |
363 | cout << m_app_name << " 2.3 : (c) 2003-2014 Fluxbox Development Team" << endl; | 363 | cout << m_app_name << " 2.3 : (c) 2003-2015 Fluxbox Development Team" << endl; |
364 | cout << m_app_name << " 2.1 : (c) 2002 Claes Nasten" << endl; | 364 | cout << m_app_name << " 2.1 : (c) 2002 Claes Nasten" << endl; |
365 | cout << m_app_name << " 2.0 : (c) 1997-2000 Brad Hughes\n" << endl; | 365 | cout << m_app_name << " 2.0 : (c) 1997-2000 Brad Hughes\n" << endl; |
366 | cout << _FB_CONSOLETEXT(fbsetroot, Usage, | 366 | cout << _FB_CONSOLETEXT(fbsetroot, Usage, |