Merge remote-tracking branch 'sstabellini/tags/xen-20161122-tag' into staging

[mirror_qemu.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 88ec2497b6ec1d05da8c30a4deaa8c4d8315bca7..3d7848cb7e71cf80a34ff3c42c0d88a00ee3fd70 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -39,9 +39,7 @@
 /qmp-introspect.[ch]
 /qmp-marshal.c
 /qemu-doc.html
-/qemu-tech.html
 /qemu-doc.info
-/qemu-tech.info
 /qemu-img
 /qemu-nbd
 /qemu-options.def
@@ -53,7 +51,9 @@
 /qemu-bridge-helper
 /qemu-monitor.texi
 /qemu-monitor-info.texi
-/qmp-commands.txt
+/qemu-version.h
+/qemu-version.h.tmp
+/module_block.h
 /vscclient
 /fsdev/virtfs-proxy-helper
 *.[1-9]