diff options
| author | James Booth <boothj5@gmail.com> | 2013-12-15 17:19:01 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2013-12-15 17:19:01 +0000 |
| commit | 2470f642c73a7b13181bf51a6f3c2ee126e9e733 (patch) | |
| tree | d578411bda883f02e3c7cc4d256bb5a96c5034bf /src/otr.h | |
| parent | 06367723d7b97abe1958944b651cdbbf9b5c856a (diff) | |
| parent | 2490f5b417a13639771211a7862bab88a6a5195e (diff) | |
| download | profani-tty-2470f642c73a7b13181bf51a6f3c2ee126e9e733.tar.gz | |
Merge branch 'master' into otr
Conflicts: src/command/command.c
Diffstat (limited to 'src/otr.h')
0 files changed, 0 insertions, 0 deletions