diff options
| author | louiz’ <louiz@louiz.org> | 2016-06-23 22:17:08 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2016-06-23 22:17:08 +0200 |
| commit | 11dcae704a8dc84643408ded9397294eec191de1 (patch) | |
| tree | a1a41154a78f2082851f7f6a8f8fd94cf1341d29 /src/bridge/bridge.hpp | |
| parent | 57263961b487bd839cbce5fe7547933240792fbc (diff) | |
| parent | 0391f17f999618decffaf3c9261024ab04a33f63 (diff) | |
| download | biboumi-11dcae704a8dc84643408ded9397294eec191de1.tar.gz biboumi-11dcae704a8dc84643408ded9397294eec191de1.tar.bz2 biboumi-11dcae704a8dc84643408ded9397294eec191de1.tar.xz biboumi-11dcae704a8dc84643408ded9397294eec191de1.zip | |
Merge remote-tracking branch 'linkmauve/escaped-iid-support'
Diffstat (limited to 'src/bridge/bridge.hpp')
| -rw-r--r-- | src/bridge/bridge.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bridge/bridge.hpp b/src/bridge/bridge.hpp index 01f8f78..6feb282 100644 --- a/src/bridge/bridge.hpp +++ b/src/bridge/bridge.hpp @@ -54,7 +54,7 @@ public: const std::string& get_jid() const; std::string get_bare_jid() const; - static Xmpp::body make_xmpp_body(const std::string& str, const std::string& encodin = "ISO-8859-1"); + static Xmpp::body make_xmpp_body(const std::string& str, const std::string& encoding = "ISO-8859-1"); /*** ** ** From XMPP to IRC. |