commit | a651b08a2f95bb206ae6385801518f93fdd5000e | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue May 09 15:44:13 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue May 09 15:44:13 2017 +0100 |
tree | be8f2f1c33014e8524738174b54a967ab9fde362 | |
parent | f3221941f27dbe4dbee550f72d42f268c228f5d1 [diff] | |
parent | 18f36906a9e40ebcf9705fa9deb197bc4a1f813a [diff] |
Merge branch 'obsd-master' Conflicts: format.c