about summary refs log tree commit diff stats
path: root/src/otr/otrlibv3.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2014-05-07 19:32:25 +0100
committerJames Booth <boothj5@gmail.com>2014-05-07 19:32:25 +0100
commit9fd9871ee908088db4209d6ecc3b4a90d8cfbf8c (patch)
tree6633fbaa2bb75435f0adf5b1f6708228ccfd0280 /src/otr/otrlibv3.c
parentaa0d4fe89287af2ca60ccd41d96171eedde1c4dd (diff)
parent143c5a34930f453245e0c1ae7f127ec5e34f0604 (diff)
downloadprofani-tty-9fd9871ee908088db4209d6ecc3b4a90d8cfbf8c.tar.gz
Merge branch 'master' into otrsmp
Diffstat (limited to 'src/otr/otrlibv3.c')
0 files changed, 0 insertions, 0 deletions