about summary refs log tree commit diff stats
path: root/src/otr/otr.h
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2016-07-24 01:13:03 +0100
committerJames Booth <boothj5@gmail.com>2016-07-24 01:13:03 +0100
commit1586ee9ed4288a6ba194b07e5c131ccc1af09df0 (patch)
tree3908d2f86a3ef9f15a53e3ab2856dfa275373388 /src/otr/otr.h
parent458334a2c75d9a527a9a5e09c087b0de21a7eff2 (diff)
parent98246577775e114784ace1b392788e8a6b4bfb49 (diff)
downloadprofani-tty-1586ee9ed4288a6ba194b07e5c131ccc1af09df0.tar.gz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/otr/otr.h')
0 files changed, 0 insertions, 0 deletions
114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141