diff options
author | Florent Le Coz <louiz@louiz.org> | 2014-04-15 04:11:27 +0200 |
---|---|---|
committer | Florent Le Coz <louiz@louiz.org> | 2014-04-15 04:11:27 +0200 |
commit | 7f74f62e56483bae6796be82d279c5180642d53b (patch) | |
tree | d0e98105c52531ae0df3931175e8b185c50e187e /src/xmpp/xmpp_parser.hpp | |
parent | 020325dbb071f1735bceb80de9f982aefcd2de47 (diff) | |
parent | c64bb0bde9dbf572bd4d3bbaf478ec812a2f12d6 (diff) | |
download | biboumi-7f74f62e56483bae6796be82d279c5180642d53b.tar.gz biboumi-7f74f62e56483bae6796be82d279c5180642d53b.tar.bz2 biboumi-7f74f62e56483bae6796be82d279c5180642d53b.tar.xz biboumi-7f74f62e56483bae6796be82d279c5180642d53b.zip |
Merge branch 'master' into dummy_chan
Diffstat (limited to 'src/xmpp/xmpp_parser.hpp')
0 files changed, 0 insertions, 0 deletions