diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-09-15 09:03:18 -0700 |
commit | 497d910c85598a75cc2be2ea932c44036c854fc3 (patch) | |
tree | 567e8ce139138e5d6bcb8f14e86dc3cb99a0df1e /android/config/Linux/config-host.h | |
parent | a3abe794b734382295b89d6c2d1d176ce4bb9b4b (diff) | |
parent | 5d8f37ad78fc66901af50c762029a501561f3b23 (diff) | |
download | external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.zip external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.gz external_qemu-497d910c85598a75cc2be2ea932c44036c854fc3.tar.bz2 |
resolved conflicts for merge of 5d8f37ad to eclair-plus-aosp
Diffstat (limited to 'android/config/Linux/config-host.h')
-rw-r--r-- | android/config/Linux/config-host.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/config/Linux/config-host.h b/android/config/Linux/config-host.h index 90defbd..cc5e07a 100644 --- a/android/config/Linux/config-host.h +++ b/android/config/Linux/config-host.h @@ -6,5 +6,6 @@ #define CONFIG_GDBSTUB 1 #define CONFIG_SLIRP 1 #define QEMU_VERSION "0.8.2" +#define QEMU_PKGVERSION "Android" #define CONFIG_SKINS 1 #define CONFIG_UNAME_RELEASE "" |