aboutsummaryrefslogtreecommitdiffstats
path: root/otr.h
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-08-31 22:06:14 +0200
committerWilmer van der Gaast <wilmer@gaast.net>2010-08-31 22:06:14 +0200
commitf5c0d8e4dd3ce01945a6334a5d87c89a9f43b16b (patch)
treee741ed193ad1921c695a8aec4c4ea57fe82e7fd7 /otr.h
parent83586911a0aa768ed196051950ebd8ffce37d467 (diff)
parent31dbb90a2d32d6988706ae4b5c2292cd43d89595 (diff)
Merge mainline stuff.
Diffstat (limited to 'otr.h')
0 files changed, 0 insertions, 0 deletions