commit | 74b958ecbed7102a0f3f5faf5d976411726661ba | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Sep 14 12:42:19 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Sep 14 12:42:19 2015 +0100 |
tree | 7b0cc592b9127fe05afc9bbbf67263489d66eb85 | |
parent | ef35c9f7659205659d6863058b9a7262b21440a5 [diff] | |
parent | 16efa8483888e326aed2c05a01b63b45a2b118ef [diff] |
Merge branch 'obsd-master' Conflicts: Makefile