commit | cb89f2f2a197db5bf7e1acc8248f381c6f0410cd | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Aug 30 21:44:01 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Aug 30 21:44:01 2015 +0100 |
tree | 9074f8aa373b1bcb857fee46a47d305152cacf06 | |
parent | 486421ceff1b4d618d84ac3cb8c4dd9135b7960d [diff] | |
parent | b87dc608d9b5b470926aaf77c5956befdfb7bc7b [diff] |
Merge branch 'obsd-master' Conflicts: Makefile format.c