commit | 0ad2beae7e55cb3918d76825e1644e07af51253e | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Feb 21 09:23:50 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Feb 21 09:23:50 2017 +0000 |
tree | 8981841befb0041f40e8f7424d2212612f4438b1 | |
parent | 55e76edd3cc9bfa8aeac60b17d3344031097b1b6 [diff] | |
parent | f27e1d07fced949f6186ef57fcb8869e70c7d1c7 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile