aboutsummaryrefslogtreecommitdiff
path: root/src/base/QXmppConstants.h
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2014-07-19 10:23:40 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2014-07-19 10:23:40 +0200
commit70e7b6005de3e4a2e0237f18196825d96f4ee4d3 (patch)
tree1b017e68025534d194362a6dc206f04a2ca8f553 /src/base/QXmppConstants.h
parent68f89992207c592cf0be8567d5c3d5e43157f9b6 (diff)
parent07ae4a63307928e1af97b75b3de23530c74beb3f (diff)
downloadqxmpp-70e7b6005de3e4a2e0237f18196825d96f4ee4d3.tar.gz
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'src/base/QXmppConstants.h')
-rw-r--r--src/base/QXmppConstants.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/base/QXmppConstants.h b/src/base/QXmppConstants.h
index 85030c12..bf544159 100644
--- a/src/base/QXmppConstants.h
+++ b/src/base/QXmppConstants.h
@@ -115,5 +115,7 @@ extern const char* ns_attention;
extern const char* ns_bob;
// XEP-0249: Direct MUC Invitations
extern const char* ns_conference;
+// XEP-0333: Char Markers
+extern const char* ns_chat_markers;
#endif // QXMPPCONSTANTS_H