Merge branch 'master' of git://git.qemu.org/qemu

2011-12-12 04:12:31 +04:00 · 2011-12-12 04:12:31 +04:00 · f18318eef8
parent 5bf1356026 62ba9f3662
commit f18318eef8
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-Read the documentation in qemu-doc.html.
+Read the documentation in qemu-doc.html or on http://wiki.qemu.org

-Fabrice Bellard.
+- QEMU team