aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-01-08 12:17:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-08 12:17:47 -0800
commit104935a0dd8857593f6f127da1d67d435b7348b0 (patch)
tree251177ae40459554833847939ab637147e92f8fd
parent802c9bd7f3353c8ce4133f20ca2f5fb98bc20bf4 (diff)
parent0edf6fb41b2ec38a3214d7a724cae70329b058b1 (diff)
downloadexternal_qemu-104935a0dd8857593f6f127da1d67d435b7348b0.zip
external_qemu-104935a0dd8857593f6f127da1d67d435b7348b0.tar.gz
external_qemu-104935a0dd8857593f6f127da1d67d435b7348b0.tar.bz2
am 0edf6fb4: am 1cb37b34: Add new -sdcard2 <file> option. Add support for FreeBSD in the standalone build system.
Merge commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1' * commit '0edf6fb41b2ec38a3214d7a724cae70329b058b1': Add new -sdcard2 <file> option.
-rw-r--r--CHANGES.TXT3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES.TXT b/CHANGES.TXT
index 35a519b..08099f0 100644
--- a/CHANGES.TXT
+++ b/CHANGES.TXT
@@ -31,6 +31,9 @@ IMPORTANT CHANGES:
The minor number will now be stuck to 0 since each official emulator
release is supposed to match a corresponding SDK Tools release.
+- Added a new option -sdcard2 <file> to be able to use two SD Card images
+ at once. Note that this requires an updated emulator-specific kernel
+ and system image. It will thus be ignored by older emulated platforms.
OTHER: