diff options
author | James Booth <boothj5@gmail.com> | 2013-08-28 23:38:36 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2013-08-28 23:38:36 +0100 |
commit | 76b1d9b7c8359a05b0386f2074b5ef87e4d8c643 (patch) | |
tree | aec0848d940d5a47e36dbfb2491b17fcac3958a5 /src/otr.h | |
parent | fccab1cd9417f830195189b21dfc73ac6ba13bb1 (diff) | |
parent | b5fb14533cb875df8ef8183b44a6c2b18ec23fba (diff) | |
download | profani-tty-76b1d9b7c8359a05b0386f2074b5ef87e4d8c643.tar.gz |
Merge branch 'master' into otr
Diffstat (limited to 'src/otr.h')
0 files changed, 0 insertions, 0 deletions