diff options
| author | James Booth <boothj5@gmail.com> | 2014-12-29 15:29:28 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-12-29 15:29:28 +0000 |
| commit | aebee209b2698eba40b1b220e162f87db23cc838 (patch) | |
| tree | f5396a26e24e5fbee16a20a832284304dfa080c6 /src/otr/otr.c | |
| parent | 1c35321cb315b7ce5bee3f5f281df103b0bc1f77 (diff) | |
| parent | 1dca023c9f56a8c1a30d1b8de08dc9878b161bf6 (diff) | |
| download | profani-tty-aebee209b2698eba40b1b220e162f87db23cc838.tar.gz | |
Merge remote-tracking branch 'incertia/connect-default'
Conflicts: CHANGELOG
Diffstat (limited to 'src/otr/otr.c')
0 files changed, 0 insertions, 0 deletions