commit | 35fd6d134a84cda69730310c89846f2bacb3cfbd | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 11 08:14:36 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 11 08:14:36 2015 +0000 |
tree | d19140d154d7149f3982e62ea77dcbcb776a4965 | |
parent | 896581628dc53556861b63f2cb4094a48f9eaf94 [diff] | |
parent | 6f3475c6c713245f5ec760298af9a04b8465b844 [diff] |
Merge branch 'obsd-master' Conflicts: utf8.c