about summary refs log tree commit diff stats
path: root/src/jabber.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2012-10-30 22:33:17 +0000
committerJames Booth <boothj5@gmail.com>2012-10-30 22:33:17 +0000
commit7f1e3084b37c20094ee80e6fd63d93c0aa9d1dc9 (patch)
tree70da489f63b7d7da34b9eaf636b17d506aa69939 /src/jabber.c
parentbee708c9d253524d4af3a9d1599300722ff69044 (diff)
parente592a431b7b2dc58bd8af7b7231cea79e6fad3ba (diff)
downloadprofani-tty-7f1e3084b37c20094ee80e6fd63d93c0aa9d1dc9.tar.gz
Merge branch 'master' into chatstates
Diffstat (limited to 'src/jabber.c')
0 files changed, 0 insertions, 0 deletions