about summary refs log tree commit diff stats
path: root/src/otr.h
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-08-26 14:52:14 +0100
committerJames Booth <boothj5@gmail.com>2013-08-26 14:52:14 +0100
commit080515fe85090d1fb1d7bbeec049755e228df790 (patch)
tree9db06e49352e275de151b22353644450ad03bd3a /src/otr.h
parent550071afded1464dc04cba856bed4687a8a968a4 (diff)
parent70bbc2e34474d9a466707d90c5d56666cf27b3ae (diff)
downloadprofani-tty-080515fe85090d1fb1d7bbeec049755e228df790.tar.gz
Merge branch 'master' into otr
Diffstat (limited to 'src/otr.h')
0 files changed, 0 insertions, 0 deletions