about summary refs log tree commit diff stats
path: root/src/otr/otrlibv3.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-13 23:48:07 +0000
committerJames Booth <boothj5@gmail.com>2015-01-13 23:48:07 +0000
commita65abed1fbb33c839cadc5e549b43e5f908b59a3 (patch)
tree33bc61aeb1438405484de5811e8be3a75c689d30 /src/otr/otrlibv3.c
parent844cd2dda713458d10c1db323cdb76aed0d9b46b (diff)
parentf6da9444794f6faa984f68c8f54849a170fe0e59 (diff)
downloadprofani-tty-a65abed1fbb33c839cadc5e549b43e5f908b59a3.tar.gz
Merge remote-tracking branch 'peterlvilim/keyring'
Diffstat (limited to 'src/otr/otrlibv3.c')
0 files changed, 0 insertions, 0 deletions