]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'master' of https://github.com/pali/util-linux
authorKarel Zak <kzak@redhat.com>
Mon, 10 Feb 2020 12:51:23 +0000 (13:51 +0100)
committerKarel Zak <kzak@redhat.com>
Mon, 10 Feb 2020 12:51:23 +0000 (13:51 +0100)
* 'master' of https://github.com/pali/util-linux:
  tests: Add UDF hdd image with emoji label created by mkudffs 2.2
  libblkid: Fix UTF-16 support in function blkid_encode_to_utf8()


Trivial merge