aboutsummaryrefslogtreecommitdiff
path: root/include/olm/memory.hh
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-25 15:33:33 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-25 15:33:33 +0100
commit54d43010c808b56caa703696a036df18d2b74575 (patch)
tree61cbc677c61e050a41669f858388a6d6cc7d732e /include/olm/memory.hh
parent024685f3db2be6c4cfb55670ecc92d8d1a0c9a8d (diff)
parent8d55954ce13b9f93cc220bcbaab56fb236d16c9c (diff)
Merge branch 'rav/jenkins_build'
Diffstat (limited to 'include/olm/memory.hh')
0 files changed, 0 insertions, 0 deletions