summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-10-31 17:01:43 +0100
committerAnthony Liguori <anthony@codemonkey.ws>2013-10-31 17:01:43 +0100
commitef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6 (patch)
tree4d1361b6ba3a4aaa2d257b16cc947b50fb2effc7 /.gitignore
parent1ba1905abd72f34836b153f3348d618da6148f87 (diff)
parent203cea22a3d33ac86d170af74f8c655f119c8c62 (diff)
downloadqemu-ef5cfe5bbd8bb05a51afaf7ab313769eb9ef44b6.tar.gz
Merge remote-tracking branch 'mjt/trivial-patches' into staging
* mjt/trivial-patches: audio/mixeng_template.h: fix inline declaration misc: Spelling and grammar fixes in comments docs/ccid.txt: fix the typo qapi: fix documentation example .gitignore: ignore qmp-commands.txt misc: New spelling fixes in comments configure: create fsdev/ directory Message-id: 1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8e1b73f622..5584b5fcb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,7 @@ qemu-ga
qemu-bridge-helper
qemu-monitor.texi
vscclient
-QMP/qmp-commands.txt
+qmp-commands.txt
test-bitops
test-coroutine
test-int128