Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150615-1' into staging

[qemu.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 090f974cb91c7e7b26616b09174af186624dd112..aed0e1ff02a5a253968ca78e261d7d1558e433b6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -37,14 +37,8 @@
 /qemu-tech.html
 /qemu-doc.info
 /qemu-tech.info
-/qemu.1
-/qemu.pod
-/qemu-img.1
-/qemu-img.pod
 /qemu-img
 /qemu-nbd
-/qemu-nbd.8
-/qemu-nbd.pod
 /qemu-options.def
 /qemu-options.texi
 /qemu-img-cmds.texi
@@ -56,8 +50,7 @@
 /qmp-commands.txt
 /vscclient
 /fsdev/virtfs-proxy-helper
-/fsdev/virtfs-proxy-helper.1
-/fsdev/virtfs-proxy-helper.pod
+*.[1-9]
 *.a
 *.aux
 *.cp
@@ -70,6 +63,7 @@
 *.ky
 *.log
 *.pdf
+*.pod
 *.cps
 *.fns
 *.kys
@@ -109,4 +103,3 @@ cscope.*
 tags
 TAGS
 *~
-/tests/qemu-iotests/common.env