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/Font.cc | |
| 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/Font.cc')
| -rw-r--r-- | src/FbTk/Font.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index f0951ff..cbd8250 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc | |||
| @@ -100,7 +100,7 @@ void resetEffects(FbTk::Font& font) { | |||
| 100 | font.setShadowOffX(2); | 100 | font.setShadowOffX(2); |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | }; // end nameless namespace | 103 | } // end nameless namespace |
| 104 | 104 | ||
| 105 | 105 | ||
| 106 | 106 | ||
| @@ -301,5 +301,5 @@ void Font::drawText(const FbDrawable &w, int screen, GC gc, | |||
| 301 | 301 | ||
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | }; | 304 | } |
| 305 | 305 | ||