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/Transparent.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/Transparent.cc')
-rw-r--r-- | src/FbTk/Transparent.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc index 992678a..bf8a110 100644 --- a/src/FbTk/Transparent.cc +++ b/src/FbTk/Transparent.cc | |||
@@ -103,7 +103,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) { | |||
103 | return alpha_pic; | 103 | return alpha_pic; |
104 | } | 104 | } |
105 | #endif // HAVE_XRENDER | 105 | #endif // HAVE_XRENDER |
106 | }; | 106 | } |
107 | 107 | ||
108 | namespace FbTk { | 108 | namespace FbTk { |
109 | 109 | ||