diff options
author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-12-21 18:00:30 +0900 |
---|---|---|
committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2015-12-21 18:16:33 +0900 |
commit | 7864519e39b0f45ebcb4be913439a03d5a962b70 (patch) | |
tree | 6460d6050bd423a50318ed149f2835a7c358e6c0 /.gitignore | |
parent | 4758dec416c733f4fa0e32563a28e7dc843aba02 (diff) | |
parent | a8c40fa2d667e585382080db36ac44e216b37a1c (diff) | |
download | qemu-7864519e39b0f45ebcb4be913439a03d5a962b70.tar.gz qemu-7864519e39b0f45ebcb4be913439a03d5a962b70.tar.bz2 qemu-7864519e39b0f45ebcb4be913439a03d5a962b70.zip |
Merge tag 'v2.5.0' into tizen_3.0_qemu_2.5
v2.5.0 release
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index bd893c6ea0..65fa775533 100644 --- a/.gitignore +++ b/.gitignore @@ -19,12 +19,13 @@ /trace/generated-ust.c /ui/shader/texture-blit-frag.h /ui/shader/texture-blit-vert.h -/libcacard/trace/generated-tracers.c *-timestamp /*-softmmu /*-darwin-user /*-linux-user /*-bsd-user +/ivshmem-client +/ivshmem-server /libdis* /libuser /linux-headers/asm @@ -34,6 +35,7 @@ /qapi-visit.[ch] /qapi-event.[ch] /qmp-commands.h +/qmp-introspect.[ch] /qmp-marshal.c /qemu-doc.html /qemu-tech.html @@ -49,6 +51,7 @@ /qemu-ga /qemu-bridge-helper /qemu-monitor.texi +/qemu-monitor-info.texi /qmp-commands.txt /vscclient /fsdev/virtfs-proxy-helper @@ -58,6 +61,7 @@ *.cp *.dvi *.exe +*.msi *.dll *.so *.dylib |