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/FbTk/Image.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/FbTk/Image.hh')
-rw-r--r-- | src/FbTk/Image.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh index 3c731ad..f828d10 100644 --- a/src/FbTk/Image.hh +++ b/src/FbTk/Image.hh | |||
@@ -50,7 +50,7 @@ namespace Image { | |||
50 | void removeAllSearchPaths(); | 50 | void removeAllSearchPaths(); |
51 | /// locates an image in the search path | 51 | /// locates an image in the search path |
52 | std::string locateFile(const std::string &filename); | 52 | std::string locateFile(const std::string &filename); |
53 | }; | 53 | } |
54 | 54 | ||
55 | /// common interface for all image classes | 55 | /// common interface for all image classes |
56 | class ImageBase { | 56 | class ImageBase { |