commit | 5f8138faf551c3678de3c92c5764e2e7edfc4602 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Dec 19 19:20:09 2014 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 19 19:22:19 2014 +0000 |
tree | 6646056b5b2bab330ec6ec62400004548dc0aa18 | |
parent | ccbe2545d9857e03731eddb9757989b9f52dc785 [diff] | |
parent | 160e3e2be3543377925551146403933a7c631f51 [diff] |
Merge branch 'obsd-master' Conflicts: format.c