diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-05 01:44:24 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-05 01:44:24 +0000 |
| commit | 77f54443eb9aa09ba33714831ff80b4e7a8fc412 (patch) | |
| tree | 40e206e65f25129ef219b03d97d53d4c8e80db4d /src/xmpp/xmpp.h | |
| parent | f569845b40057dcc90d588e46147f7694a0b5e1b (diff) | |
| parent | 61ea120bfd8fd327f4c0641feda10e7a8e013c74 (diff) | |
| download | profani-tty-77f54443eb9aa09ba33714831ff80b4e7a8fc412.tar.gz | |
Merge branch 'master' into otr
Diffstat (limited to 'src/xmpp/xmpp.h')
0 files changed, 0 insertions, 0 deletions