Merge remote-tracking branch 'origin/master' into staging

[qemu.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3efb4ecc137e3193200d907613074b75a1565059..08013fc57bef257b487f9535cd878008dcdefd8c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,9 @@ QMP/qmp-commands.txt
 *.ky
 *.log
 *.pdf
+*.cps
+*.fns
+*.kys
 *.pg
 *.pyc
 *.toc
@@ -51,6 +54,8 @@ QMP/qmp-commands.txt
 *.vr
 *.d
 *.o
+*.swp
+*.orig
 .pc
 patches
 pc-bios/bios-pq/status
@@ -60,3 +65,6 @@ pc-bios/optionrom/multiboot.bin
 pc-bios/optionrom/multiboot.raw
 .stgit-*
 cscope.*
+tags
+TAGS
+*~