commit | 3df4959f51a444a83e92894c390182dd48e02025 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Nov 13 10:42:45 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Nov 13 10:42:45 2015 +0000 |
tree | 31591c7d439c6d3841e1610e4c2cf70d5f5d115c | |
parent | a7027ed8e5d8fd314c1fafaf0c809b575a753a09 [diff] | |
parent | c5689a5a4031a43769b8b721cafa6d1eab6abc44 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile