diff options
| author | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
|---|---|---|
| committer | Jim Ramsay <i.am@jimramsay.com> | 2009-10-14 01:05:49 (GMT) |
| commit | 839ea523164caecd8c779e60539b78c2a748a81f (patch) | |
| tree | 0019d04f27a1a258bc7a900e3cf77b916dca6493 /util/fbrun | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-argb.zip fluxbox_lack-argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'util/fbrun')
| -rw-r--r-- | util/fbrun/FbRun.cc | 10 | ||||
| -rw-r--r-- | util/fbrun/main.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc index f98a02e..3bf83aa 100644 --- a/util/fbrun/FbRun.cc +++ b/util/fbrun/FbRun.cc | |||
| @@ -21,11 +21,11 @@ | |||
| 21 | 21 | ||
| 22 | #include "FbRun.hh" | 22 | #include "FbRun.hh" |
| 23 | 23 | ||
| 24 | #include "App.hh" | 24 | #include "FbTk/App.hh" |
| 25 | #include "EventManager.hh" | 25 | #include "FbTk/EventManager.hh" |
| 26 | #include "Color.hh" | 26 | #include "FbTk/Color.hh" |
| 27 | #include "KeyUtil.hh" | 27 | #include "FbTk/KeyUtil.hh" |
| 28 | #include "FileUtil.hh" | 28 | #include "FbTk/FileUtil.hh" |
| 29 | 29 | ||
| 30 | #ifdef HAVE_CONFIG_H | 30 | #ifdef HAVE_CONFIG_H |
| 31 | #include "config.h" | 31 | #include "config.h" |
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc index 0bb8456..edb88ff 100644 --- a/util/fbrun/main.cc +++ b/util/fbrun/main.cc | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
| 21 | 21 | ||
| 22 | #include "FbRun.hh" | 22 | #include "FbRun.hh" |
| 23 | #include "App.hh" | 23 | #include "FbTk/App.hh" |
| 24 | #include "StringUtil.hh" | 24 | #include "FbTk/StringUtil.hh" |
| 25 | #include "Color.hh" | 25 | #include "FbTk/Color.hh" |
| 26 | 26 | ||
| 27 | #ifdef XINERAMA | 27 | #ifdef XINERAMA |
| 28 | extern "C" { | 28 | extern "C" { |