update

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@988 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Changelog b/Changelog
index 614e18cf4770d580d6435c502eb9a5643dcdd2d9..bd8d41b1f92095785e58ff7a2e280f1042aa3eed 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -16,13 +16,13 @@ version 0.5.6:
   - PIC reset fix (Hidemi KAWAI)
   - PIC spurious irq support (aka Solaris install bug)
   - added '-localtime' option
-  - Cirrus CLGD 54xx VGA support (initial patch by Makoto Suzuki
-    (suzu))
+  - Cirrus CL-GD54xx VGA support (initial patch by Makoto Suzuki (suzu))
   - APM and system shutdown support
   - Fixed system reset
   - Support for other PC BIOSes
   - Initial PowerMac hardware emulation
   - PowerMac/PREP OpenFirmware compatible BIOS (Jocelyn Mayer)
+  - Set the default memory size for PC emulation to 128 MB
 
 version 0.5.5:
 

diff --git a/VERSION b/VERSION
index 389faccca38e058efa4627fb555161acb2cc894a..09a3acfa138db01dc50a688796b2861638c369ec 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.5
\ No newline at end of file
+0.6.0
\ No newline at end of file