about summary refs log tree commit diff stats
path: root/src/xmpp/stanza.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-15 23:45:18 +0000
committerJames Booth <boothj5@gmail.com>2015-01-15 23:45:18 +0000
commit9083bfdb5c7fa166802f1839442a045ecb61f7e9 (patch)
tree0b26e03c75b51b6f6c1811969a2d4c54df72bbdc /src/xmpp/stanza.c
parentbb11dc097320443c810ea0572f7b988bfa48e4a4 (diff)
parent51105720ab32faa4548655266ca0ae4c661f0701 (diff)
downloadprofani-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