diff options
author | James Booth <boothj5@gmail.com> | 2015-02-14 16:22:45 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-02-14 16:22:45 +0000 |
commit | 965187edefb5bf2fc0a9bf05edb84ff89512167d (patch) | |
tree | b30b5fcb7dbf4bc6711bd24f40c7c2f26ac5b312 /src/xmpp/xmpp.h | |
parent | c9a6e10c2621a5df3285c881fa98eb00707fc6ad (diff) | |
parent | d02b364b3ca8728c9b2fdc181400906050e9fd45 (diff) | |
download | profani-tty-965187edefb5bf2fc0a9bf05edb84ff89512167d.tar.gz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/xmpp/xmpp.h')
0 files changed, 0 insertions, 0 deletions