aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge 29e114d2 from master. do not merge."Xavier Ducrohet2011-03-181-36/+0
* Merge "Merge 29e114d2 from master. do not merge." into tools_r10Xavier Ducrohet2011-03-181-0/+36
|\
| * Merge 29e114d2 from master. do not merge.David 'Digit' Turner2011-03-181-0/+36
|/
* Merge "Merge 59e8e196 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-168-20/+49
|\
| * Merge 59e8e196 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-168-20/+49
|/
* Merge "Fix "avd name" bug." into tools_r10David 'Digit' Turner2011-02-162-0/+6
|\
| * Fix "avd name" bug.David 'Digit' Turner2011-02-172-0/+6
|/
* Merge "Merge 593d0ea0 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-151-5/+7
|\
| * Merge 593d0ea0 into tools_r10. DO NOT MERGE.David 'Digit' Turner2011-02-151-5/+7
|/
* Merge "Rename emulator_config_xxx to user_config_xxx"David 'Digit' Turner2011-02-094-10/+10
|\
| * Rename emulator_config_xxx to user_config_xxxDavid 'Digit' Turner2011-02-094-10/+10
|/
* Merge "emulator: Fix -no-window flag"David 'Digit' Turner2011-02-091-0/+2
|\
| * emulator: Fix -no-window flagDavid 'Digit' Turner2011-02-091-0/+2
* | Merge "android-configure.sh: Fix --cc=<compiler> option."David 'Digit' Turner2011-02-096-8/+42
|\ \ | |/
| * android-configure.sh: Fix --cc=<compiler> option.David 'Digit' Turner2011-02-096-8/+42
* | Merge "elff: Remove un-needed qemu-common.h include."David 'Digit' Turner2011-02-096-30/+13
|\ \ | |/
| * elff: Remove un-needed qemu-common.h include.David 'Digit' Turner2011-02-096-30/+13
* | Merge "Rename qemu-android to qemu-android-$(TARGET_ARCH)"David 'Digit' Turner2011-02-091-2/+1
|\ \ | |/
| * Rename qemu-android to qemu-android-$(TARGET_ARCH)David 'Digit' Turner2011-02-091-2/+1
* | Merge "Fixing aborts caused by compute_fb_update_rect_linear() when the frame...David Turner2011-02-092-1/+11
|\ \ | |/ |/|
| * Fixing aborts caused by compute_fb_update_rect_linear() when the framebuffersJun Nakajima2011-02-082-1/+11
|/
* Merge "Fix emulator core and UI on Windows"Vladimir Chtchetkine2011-02-076-10/+107
|\
| * Fix emulator core and UI on WindowsVladimir Chtchetkine2011-02-076-10/+107
|/
* Merge "Fix android-configure.sh"Vladimir Chtchetkine2011-02-071-0/+5
|\
| * Fix android-configure.shDavid 'Digit' Turner2011-02-071-0/+5
|/
* Merge "events: Fix no-Dpad emulation when hw.keyboard=yes"David 'Digit' Turner2011-02-061-0/+23
|\
| * events: Fix no-Dpad emulation when hw.keyboard=yesDavid 'Digit' Turner2011-02-061-0/+23
|/
* Merge "Improve telephony emulation support."David 'Digit' Turner2011-02-041-38/+38
|\
| * Improve telephony emulation support.David 'Digit' Turner2011-02-041-38/+38
* | Merge "x86: Add x86 support. Rebase the change (20906/1) due to a minor confl...David Turner2011-02-0315-43/+235
|\ \ | |/ |/|
| * x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.Jun Nakajima2011-02-0215-43/+235
|/
* Merge "Formatting / Code styling."David 'Digit' Turner2011-02-024-85/+91
|\
| * Formatting / Code styling.David 'Digit' Turner2011-02-024-85/+91
|/
* Merge "Remove QEMU-ism from UI code."David 'Digit' Turner2011-02-026-895/+31
|\
| * Remove QEMU-ism from UI code.David 'Digit' Turner2011-02-026-895/+31
|/
* Merge changes Icd076267,I6d5ad6ecDavid 'Digit' Turner2011-02-0218-1358/+241
|\
| * Simplify UI-only sources.David 'Digit' Turner2011-02-0211-1152/+108
| * Simplify core framebuffer management.David 'Digit' Turner2011-02-027-206/+133
|/
* Merge "Move framebuffer.h to android/"David 'Digit' Turner2011-02-0211-16/+15
|\
| * Move framebuffer.h to android/David 'Digit' Turner2011-02-0211-16/+15
* | Merge "Move core-connection.c from to android/protocol/"David 'Digit' Turner2011-02-0211-9/+9
|\ \ | |/
| * Move core-connection.c from to android/protocol/David 'Digit' Turner2011-02-0211-9/+9
* | Merge "Separate init_skinned_ui() into two functions."David 'Digit' Turner2011-02-026-214/+227
|\ \ | |/
| * Separate init_skinned_ui() into two functions.David 'Digit' Turner2011-02-026-214/+227
* | Merge "Move common main routines from into android-common.[hc]"David 'Digit' Turner2011-02-025-938/+582
|\ \ | |/
| * Move common main routines from into android-common.[hc]David 'Digit' Turner2011-02-025-938/+582
|/
* Merge "Create user data image using the initial user data image"David Turner2011-02-011-1/+0
|\
| * Create user data image using the initial user data imageOrjan Percy2011-01-281-1/+0
* | Merge "Add cache-util.c to built sources for PPC"David Turner2011-02-011-1/+2
|\ \
| * | Add cache-util.c to built sources for PPCMarcus Comstedt2011-02-011-1/+2