diff options
| author | James Booth <boothj5@gmail.com> | 2014-05-02 00:59:40 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-05-02 00:59:40 +0100 |
| commit | aa0d4fe89287af2ca60ccd41d96171eedde1c4dd (patch) | |
| tree | 6ff199aa574fb3895d1e004b31029d7cc9b5dae5 /src/xmpp/xmpp.h | |
| parent | a077d2008a25e5639f558c09077de5ebb8a921fd (diff) | |
| parent | 8ecfbdff7d5a0ace68e1c6366de77ecf517c67d4 (diff) | |
| download | profani-tty-aa0d4fe89287af2ca60ccd41d96171eedde1c4dd.tar.gz | |
Merge branch 'master' into otrsmp
Conflicts: install-all.sh
Diffstat (limited to 'src/xmpp/xmpp.h')
0 files changed, 0 insertions, 0 deletions