diff options
| author | James Booth <boothj5@gmail.com> | 2015-01-15 23:45:18 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-01-15 23:45:18 +0000 |
| commit | 9083bfdb5c7fa166802f1839442a045ecb61f7e9 (patch) | |
| tree | 0b26e03c75b51b6f6c1811969a2d4c54df72bbdc /src/xmpp/stanza.c | |
| parent | bb11dc097320443c810ea0572f7b988bfa48e4a4 (diff) | |
| parent | 51105720ab32faa4548655266ca0ae4c661f0701 (diff) | |
| download | profani-tty-9083bfdb5c7fa166802f1839442a045ecb61f7e9.tar.gz | |
Merge branch 'master' into inp-utf8
Conflicts: src/ui/inputwin.c
Diffstat (limited to 'src/xmpp/stanza.c')
0 files changed, 0 insertions, 0 deletions