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 22:53:50 +0000
committerJames Booth <boothj5@gmail.com>2015-01-15 22:53:50 +0000
commite326aaa84fd6a3f403e0ec80e02e2b766a5f74c7 (patch)
tree0a6cb9d1cc0ece646a90a5173a9be46fc23955d3 /src/xmpp/stanza.c
parent173a3a82bb196baf2d8cb7a093ffb6a594830e50 (diff)
parentad896ef201a92acb02b208013bc4ed996204a2df (diff)
downloadprofani-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