diff options
| author | James Booth <boothj5@gmail.com> | 2013-08-27 00:17:12 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-08-27 00:17:12 +0100 |
| commit | fccab1cd9417f830195189b21dfc73ac6ba13bb1 (patch) | |
| tree | dcfdb396ffb892c9c5c117a2bf7c3cab4a118579 /src/otr.h | |
| parent | 080515fe85090d1fb1d7bbeec049755e228df790 (diff) | |
| parent | bac97125a33aeacc9d1bc70c557ee53c2c3459d4 (diff) | |
| download | profani-tty-fccab1cd9417f830195189b21dfc73ac6ba13bb1.tar.gz | |
Merge branch 'master' into otr
Diffstat (limited to 'src/otr.h')
0 files changed, 0 insertions, 0 deletions