about summary refs log tree commit diff stats
path: root/src/otr
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-01-16 23:12:00 +0000
committerJames Booth <boothj5@gmail.com>2015-01-16 23:12:00 +0000
commit972d524fdcbcf7d706f5970853180a856ff044b8 (patch)
tree613b1a215ede3314cd4600783550baf849dda7ce /src/otr
parent9fad03af747a2345fa3da7d071a6acd1017d204b (diff)
parent4c6cfcdca0f7aec1f0e3243a60d88ed494357a5d (diff)
downloadprofani-tty-972d524fdcbcf7d706f5970853180a856ff044b8.tar.gz
Merge branch 'master' into inp-utf8
Diffstat (limited to 'src/otr')
0 files changed, 0 insertions, 0 deletions
122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159