diff options
| author | Florent Le Coz <louiz@louiz.org> | 2014-08-18 02:08:30 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-08-18 02:08:30 +0200 |
| commit | 017f69a03b696bad1523b98e7704f70d2256c9cb (patch) | |
| tree | e9ce48a6d6426561e76ad65beff42904cea18174 /src/xmpp/adhoc_session.cpp | |
| parent | 41e8a3ba9b57e67aec5d0d30112338664afbd6e4 (diff) | |
| parent | f4c08242fb55809cca3e12d66cbc39e5c9b51fb0 (diff) | |
| download | biboumi-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/adhoc_session.cpp')
0 files changed, 0 insertions, 0 deletions