diff options
| author | Karel Zak | 2017-05-11 10:59:14 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-05-11 10:59:14 +0200 |
| commit | ce59d8bfa596262aba128a220d33d9a14646f9d6 (patch) | |
| tree | b6cb4dc7600e129c10b050a743f67b9490f325ad /libblkid/docs | |
| parent | tests: update wipe-partition (diff) | |
| parent | tests: Add UDF CD-ROM hybrid image (ISO+Joliet+UDF) created by Nero 6 (diff) | |
| download | kernel-qcow2-util-linux-ce59d8bfa596262aba128a220d33d9a14646f9d6.tar.gz kernel-qcow2-util-linux-ce59d8bfa596262aba128a220d33d9a14646f9d6.tar.xz kernel-qcow2-util-linux-ce59d8bfa596262aba128a220d33d9a14646f9d6.zip | |
Merge branch 'master' of https://github.com/pali/util-linux
* 'master' of https://github.com/pali/util-linux:
tests: Add UDF CD-ROM hybrid image (ISO+Joliet+UDF) created by Nero 6
tests: Fix test output for low-probe-udf to contain UDF data
Revert "libblkid: Probe UDF volumes for ISO9660 info as well"
Diffstat (limited to 'libblkid/docs')
| -rw-r--r-- | libblkid/docs/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libblkid/docs/Makefile.am b/libblkid/docs/Makefile.am index dc6dd3e5e..83232c4a0 100644 --- a/libblkid/docs/Makefile.am +++ b/libblkid/docs/Makefile.am @@ -58,7 +58,7 @@ EXTRA_HFILES= # Header files to ignore when scanning. Use base file name, no paths # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h IGNORE_HFILES=blkidP.h partitions.h superblocks.h \ - topology.h aix.h dos.h iso9660.h + topology.h aix.h dos.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png |