commit | e304673c65d774bb76e5d55c095c8c8e6b05ff91 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Mar 02 18:10:51 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Mar 02 18:10:51 2016 +0000 |
tree | af461e71978b76dad59348d924a37f62b8c0bb7d | |
parent | e9d369a09e48ea8f940958025c8444988d31e840 [diff] | |
parent | b8a102d26f41e57b94359627a4df8f22af10c6fa [diff] |
Merge branch 'obsd-master' Conflicts: utf8.c