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-28 23:38:36 +0100
committerJames Booth <boothj5@gmail.com>2013-08-28 23:38:36 +0100
commit76b1d9b7c8359a05b0386f2074b5ef87e4d8c643 (patch)
treeaec0848d940d5a47e36dbfb2491b17fcac3958a5 /src/otr.h
parentfccab1cd9417f830195189b21dfc73ac6ba13bb1 (diff)
parentb5fb14533cb875df8ef8183b44a6c2b18ec23fba (diff)
downloadprofani-tty-76b1d9b7c8359a05b0386f2074b5ef87e4d8c643.tar.gz
Merge branch 'master' into otr
Diffstat (limited to 'src/otr.h')
0 files changed, 0 insertions, 0 deletions