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.cc | |
| 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 'src/FbTk/Image.cc')
| -rw-r--r-- | src/FbTk/Image.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc index 0c7b5fc..070672e 100644 --- a/src/FbTk/Image.cc +++ b/src/FbTk/Image.cc | |||
| @@ -59,7 +59,7 @@ FbTk::ImageXPM xpm_loader; | |||
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||
| 61 | 61 | ||
| 62 | }; // end of anonymous namespace | 62 | } // end of anonymous namespace |
| 63 | 63 | ||
| 64 | namespace FbTk { | 64 | namespace FbTk { |
| 65 | 65 | ||