commit | b9dc855016cf79c8bb8469c272dbc6bca24deadc | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Oct 12 09:45:49 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Oct 12 09:45:49 2016 +0100 |
tree | a2049bea7b17ededbd12b77110d47353ed832e46 | |
parent | 27126f87976c63161fcae2ab1eb9c6df726a84ff [diff] | |
parent | 5c49e1d0c1afaf98512b2ffd1f31d91fecff9851 [diff] |
Merge branch 'obsd-master' Conflicts: format.c osdep-openbsd.c