summaryrefslogtreecommitdiff
path: root/src/xmpp/jid.cpp
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-08-18 02:08:30 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-08-18 02:08:30 +0200
commit017f69a03b696bad1523b98e7704f70d2256c9cb (patch)
treee9ce48a6d6426561e76ad65beff42904cea18174 /src/xmpp/jid.cpp
parent41e8a3ba9b57e67aec5d0d30112338664afbd6e4 (diff)
parentf4c08242fb55809cca3e12d66cbc39e5c9b51fb0 (diff)
downloadbiboumi-017f69a03b696bad1523b98e7704f70d2256c9cb.tar.gz
biboumi-017f69a03b696bad1523b98e7704f70d2256c9cb.tar.bz2
biboumi-017f69a03b696bad1523b98e7704f70d2256c9cb.tar.xz
biboumi-017f69a03b696bad1523b98e7704f70d2256c9cb.zip
Merge branch 'v1'
Conflicts: CMakeLists.txt
Diffstat (limited to 'src/xmpp/jid.cpp')
0 files changed, 0 insertions, 0 deletions