commit | ffb83d23e17e99589f46edc3e08f78dd32936e4e | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Feb 14 23:54:07 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Feb 14 23:54:07 2015 +0000 |
tree | eaa685cd8ce41ba6c3114037bf42d22999ae4f9a | |
parent | b4750e4c352f70ce515bed1279d8561a288f1f1b [diff] | |
parent | 4d05d8830482f8d5b5f812d082f1332090fcf027 [diff] |
Merge branch 'obsd-master' Conflicts: Makefile