Diff

COPYING @ 7788:cf1d7e35a160

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 15 Dec 2016 13:24:53 +0100 (2016-12-15)
parent 4304:73bf8aab8b77
child 12353:5ace23519e71
line wrap: on
line diff