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:31:06 +0000
committerJames Booth <boothj5@gmail.com>2015-01-15 23:31:06 +0000
commitbb11dc097320443c810ea0572f7b988bfa48e4a4 (patch)
treed47111ec274c16354c9769a1c1789805a740e492 /src/xmpp/stanza.c
parente326aaa84fd6a3f403e0ec80e02e2b766a5f74c7 (diff)
parent65fc4bcd9ff8e92c0f87e1c9520974a805a9ceac (diff)
downloadprofani-tty-bb11dc097320443c810ea0572f7b988bfa48e4a4.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