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/ImageImlib2.cc | |
parent | 4d3aa646c1d1d1de4fdb31f938f6ea62fd5dd21e (diff) | |
parent | 8def80cec337a986b762cdbb5e2555c6da809353 (diff) | |
download | fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.zip fluxbox_lack-839ea523164caecd8c779e60539b78c2a748a81f.tar.bz2 |
Merge branch 'master' into argbtesting/argbargb
Conflicts:
src/FbTk/FbWindow.cc
Diffstat (limited to 'src/FbTk/ImageImlib2.cc')
-rw-r--r-- | src/FbTk/ImageImlib2.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc index 9983604..5bac7a4 100644 --- a/src/FbTk/ImageImlib2.cc +++ b/src/FbTk/ImageImlib2.cc | |||
@@ -35,7 +35,7 @@ typedef ScreenImlibContextContainer::iterator ScreenImlibContext; | |||
35 | 35 | ||
36 | ScreenImlibContextContainer contexts; | 36 | ScreenImlibContextContainer contexts; |
37 | 37 | ||
38 | }; // anon namespace | 38 | } // anon namespace |
39 | 39 | ||
40 | 40 | ||
41 | namespace FbTk { | 41 | namespace FbTk { |