Changeset 544a2e4 in mainline for contrib/conf/ia32-qe.sh

Timestamp:

2011-05-30T21:37:43Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• contrib/conf/ia32-qe.sh (modified) (1 diff)

contrib/conf/ia32-qe.sh

@@ -8 +8 @@
 fi
 
-qemu -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d
+qemu $@ -m 32 -hda "$DISK_IMG" -cdrom image.iso -boot d