diff options
author | James Booth <boothj5@gmail.com> | 2015-01-16 00:41:02 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-01-16 00:41:02 +0000 |
commit | 9fad03af747a2345fa3da7d071a6acd1017d204b (patch) | |
tree | b18c16e89476115f288b8e95b53f9349752b29dc /src/xmpp/capabilities.h | |
parent | 9083bfdb5c7fa166802f1839442a045ecb61f7e9 (diff) | |
parent | 7a5deca77c4f1b792dde0a1a361b02fa86807a68 (diff) | |
download | profani-tty-9fad03af747a2345fa3da7d071a6acd1017d204b.tar.gz |
Merge branch 'master' into inp-utf8
Conflicts: src/ui/inputwin.c
Diffstat (limited to 'src/xmpp/capabilities.h')
0 files changed, 0 insertions, 0 deletions