about summary refs log tree commit diff stats
path: root/src/xmpp/capabilities.h
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-04-22 23:53:15 +0100
committerJames Booth <boothj5@gmail.com>2014-04-22 23:53:15 +0100
commit1a0f12b0e6d7f191f1d765e426dd0d53d411741a (patch)
tree72e7bcd273022db9439249ccec2fb39122e11f37 /src/xmpp/capabilities.h
parent2c15aba92a8288e41bea6e12933a14ffe390e1f4 (diff)
parent1192e67cf76ba953031f420e5ac790989a81530c (diff)
downloadprofani-tty-1a0f12b0e6d7f191f1d765e426dd0d53d411741a.tar.gz
Merge remote-tracking branch 'lucian/master'
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions