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 /src/ButtonTool.hh | |
| parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
| parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
| download | fluxbox_lack-testing/argb.zip fluxbox_lack-testing/argb.tar.bz2 | |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/ButtonTool.hh')
| -rw-r--r-- | src/ButtonTool.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ButtonTool.hh b/src/ButtonTool.hh index 4339722..484fea6 100644 --- a/src/ButtonTool.hh +++ b/src/ButtonTool.hh | |||
| @@ -31,7 +31,7 @@ class ButtonTheme; | |||
| 31 | namespace FbTk { | 31 | namespace FbTk { |
| 32 | class Button; | 32 | class Button; |
| 33 | class ImageControl; | 33 | class ImageControl; |
| 34 | }; | 34 | } |
| 35 | 35 | ||
| 36 | class ButtonTool: public GenericTool { | 36 | class ButtonTool: public GenericTool { |
| 37 | public: | 37 | public: |