commit | 31ae09efa042d9cbe79df36c83890c806c9bd626 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Mar 20 13:45:18 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Mar 20 13:45:18 2017 +0000 |
tree | 048a94d907f34a79e4889b2e74d5f4f71c04d82d | |
parent | 066575fd5ae6ffe5b1a7c8c54a7189ecac9cdec0 [diff] | |
parent | 67d2335130295f626cc87468fc069ecdedf2d92a [diff] |
Merge branch 'obsd-master' Conflicts: utf8.c