diff options
| author | James Booth <boothj5@gmail.com> | 2015-01-15 22:53:50 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-01-15 22:53:50 +0000 |
| commit | e326aaa84fd6a3f403e0ec80e02e2b766a5f74c7 (patch) | |
| tree | 0a6cb9d1cc0ece646a90a5173a9be46fc23955d3 /src/xmpp/stanza.c | |
| parent | 173a3a82bb196baf2d8cb7a093ffb6a594830e50 (diff) | |
| parent | ad896ef201a92acb02b208013bc4ed996204a2df (diff) | |
| download | profani-tty-e326aaa84fd6a3f403e0ec80e02e2b766a5f74c7.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