diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-19 17:33:35 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-19 17:33:35 +0100 |
| commit | d612b9695a762db2264113b9cc73ecc8adf685d2 (patch) | |
| tree | 59a5e730ec86d83a1658e4ad07f839e62f07c99e /configure-debug | |
| parent | 60f94722d469d24b51634ad09134ce5424e4219f (diff) | |
| parent | e688dd7d289a3d26c9e1dc340f9cbb24e526a9bd (diff) | |
| download | profani-tty-d612b9695a762db2264113b9cc73ecc8adf685d2.tar.gz | |
Merge branch 'master' into pgp
Conflicts: src/xmpp/message.c
Diffstat (limited to 'configure-debug')
0 files changed, 0 insertions, 0 deletions