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/fbsetroot.hh | |
| 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/fbsetroot.hh')
| -rw-r--r-- | util/fbsetroot.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/fbsetroot.hh b/util/fbsetroot.hh index 5a4400f..3cc931b 100644 --- a/util/fbsetroot.hh +++ b/util/fbsetroot.hh | |||
| @@ -27,7 +27,7 @@ namespace FbTk { | |||
| 27 | 27 | ||
| 28 | class ImageControl; | 28 | class ImageControl; |
| 29 | 29 | ||
| 30 | }; | 30 | } |
| 31 | 31 | ||
| 32 | class fbsetroot : public FbTk::App { | 32 | class fbsetroot : public FbTk::App { |
| 33 | public: | 33 | public: |