about summary refs log tree commit diff stats
path: root/src/otr/otrlibv4.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-05-04 00:43:36 +0100
committerJames Booth <boothj5@gmail.com>2015-05-04 00:43:36 +0100
commitbab4da039a69b4a51d7d909eb63c4667807c900c (patch)
tree46cfdf7835c9159806126d1285c67f9155f15b91 /src/otr/otrlibv4.c
parent0f3bece9e2238a0d13731f4415dca573aec15415 (diff)
parentc3d2a7e9377c9d16f1ee4ea57c6e0c1f78b5ac6e (diff)
downloadprofani-tty-bab4da039a69b4a51d7d909eb63c4667807c900c.tar.gz
Merge branch 'master' into pgp
Diffstat (limited to 'src/otr/otrlibv4.c')
0 files changed, 0 insertions, 0 deletions