diff options
| author | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
|---|---|---|
| committer | Mathias Gumz <akira at fluxbox dot org> | 2008-08-14 05:52:39 (GMT) |
| commit | e169d33552c8e7070aa6e13da0187f2013b4cfc3 (patch) | |
| tree | ae9e92c7e885791c7f47645184070cbcd441ab94 /src/FbTk/FbString.cc | |
| parent | c82e7c0080f8a5c14dcf95ec92dc42f59ea9dd8b (diff) | |
| parent | 91ca3bc5c8e2b892a9a81b18246f72aba7deebfd (diff) | |
| download | fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.zip fluxbox-e169d33552c8e7070aa6e13da0187f2013b4cfc3.tar.bz2 | |
Merge branch 'master' into to_push
Diffstat (limited to 'src/FbTk/FbString.cc')
| -rw-r--r-- | src/FbTk/FbString.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc index c8129db..0164afd 100644 --- a/src/FbTk/FbString.cc +++ b/src/FbTk/FbString.cc | |||
| @@ -239,7 +239,7 @@ bool haveUTF8() { | |||
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | 241 | ||
| 242 | }; // end namespace StringUtil | 242 | } // end namespace StringUtil |
| 243 | 243 | ||
| 244 | StringConvertor::StringConvertor(EncodingTarget target): | 244 | StringConvertor::StringConvertor(EncodingTarget target): |
| 245 | #ifdef HAVE_ICONV | 245 | #ifdef HAVE_ICONV |
| @@ -289,4 +289,4 @@ string StringConvertor::recode(const string &src) { | |||
| 289 | #endif | 289 | #endif |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | }; // end namespace FbTk | 292 | } // end namespace FbTk |