diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-19 19:50:19 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-19 19:50:19 +0100 |
| commit | 9be265591a4e070f26edca7f9bfa3d84c932bd5a (patch) | |
| tree | a7bb54231a3ef8c2cf2a849853b7c404673b6bfc /src/xmpp/xmpp.h | |
| parent | d612b9695a762db2264113b9cc73ecc8adf685d2 (diff) | |
| parent | 32da6548da7bc9941b2ff64924223d67cdb0b063 (diff) | |
| download | profani-tty-9be265591a4e070f26edca7f9bfa3d84c932bd5a.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src/xmpp/xmpp.h')
0 files changed, 0 insertions, 0 deletions