Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | arm-dis.c: minor integrate | David 'Digit' Turner | 2011-06-01 | 2 | -58/+76 | |
| * | fpu: upstream integrate | David 'Digit' Turner | 2011-06-01 | 6 | -791/+1888 | |
| * | json-lexer.c, json-parser.c: minor integrate | David 'Digit' Turner | 2011-06-01 | 2 | -8/+5 | |
| * | trace.h: minor C compatibility fixes. | David 'Digit' Turner | 2011-06-01 | 1 | -3/+3 | |
| * | qemu-char.h, console.h: upstream integration | David 'Digit' Turner | 2011-06-01 | 9 | -125/+409 | |
| * | qemu-timer.c: rename qemu_timer_new_scale() | David 'Digit' Turner | 2011-06-01 | 27 | -150/+130 | |
| * | qemu-timer.c: upstream integrate | David 'Digit' Turner | 2011-06-01 | 7 | -195/+463 | |
| * | qerror: minor integrate | David 'Digit' Turner | 2011-06-01 | 2 | -5/+24 | |
| * | qemu-error: minor integrate | David 'Digit' Turner | 2011-06-01 | 6 | -28/+25 | |
| * | posix-aio-compat.c: minor integrate | David 'Digit' Turner | 2011-06-01 | 1 | -2/+10 | |
| * | os-posix.c + os-win32.c and dependencies | David 'Digit' Turner | 2011-06-01 | 15 | -272/+1063 | |
| * | qemu-common.h: other intergrates | David 'Digit' Turner | 2011-06-01 | 7 | -283/+346 | |
| * | integrate: qemu-common.h changes | David 'Digit' Turner | 2011-06-01 | 13 | -138/+316 | |
|/ | ||||||
* | Merge "vl-android.c: Fix PC Bios search order." | David 'Digit' Turner | 2011-06-01 | 1 | -46/+30 | |
|\ | ||||||
| * | vl-android.c: Fix PC Bios search order. | David 'Digit' Turner | 2011-06-01 | 1 | -46/+30 | |
|/ | ||||||
* | Merge "android-rebuild.sh: Better parallel builds." | David 'Digit' Turner | 2011-06-01 | 1 | -3/+17 | |
|\ | ||||||
| * | android-rebuild.sh: Better parallel builds. | David 'Digit' Turner | 2011-06-01 | 1 | -3/+17 | |
* | | Merge "android-configure.sh: fix KVM-enabled builds." | David 'Digit' Turner | 2011-06-01 | 1 | -1/+16 | |
|\ \ | |/ | ||||||
| * | android-configure.sh: fix KVM-enabled builds. | David 'Digit' Turner | 2011-06-01 | 1 | -1/+16 | |
|/ | ||||||
* | Merge "kvm: Fix KVM auto-detection" | David 'Digit' Turner | 2011-05-31 | 1 | -28/+2 | |
|\ | ||||||
| * | kvm: Fix KVM auto-detection | David 'Digit' Turner | 2011-05-30 | 1 | -28/+2 | |
|/ | ||||||
* | Merge "x86: Workaorund for the KVM GS_BASE MSR save/restore issue." | David Turner | 2011-05-30 | 7 | -1/+182 | |
|\ | ||||||
| * | x86: Workaorund for the KVM GS_BASE MSR save/restore issue. | Jun Nakajima | 2011-05-27 | 7 | -1/+182 | |
|/ | ||||||
* | Merge "Fix Mac and Windows builds." | David 'Digit' Turner | 2011-05-25 | 1 | -0/+3 | |
|\ | ||||||
| * | Fix Mac and Windows builds. | David 'Digit' Turner | 2011-05-26 | 1 | -0/+3 | |
|/ | ||||||
* | Merge "x86: kvm: fix KVM build + enable auto-detection." | David 'Digit' Turner | 2011-05-25 | 12 | -13/+2033 | |
|\ | ||||||
| * | x86: kvm: fix KVM build + enable auto-detection. | David 'Digit' Turner | 2011-05-26 | 12 | -13/+2033 | |
|/ | ||||||
* | Merge "fix audio backend handling" | David 'Digit' Turner | 2011-05-24 | 1 | -0/+3 | |
|\ | ||||||
| * | fix audio backend handling | David 'Digit' Turner | 2011-05-21 | 1 | -0/+3 | |
* | | Reconcile with honeycomb-mr1-release | The Android Open Source Project | 2011-05-20 | 0 | -0/+0 | |
|\ \ | |/ |/| | ||||||
| * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-07 | 0 | -0/+0 | |
| |\ | ||||||
| | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-05 | 0 | -0/+0 | |
| | |\ | |/ / | ||||||
| | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-05 | 0 | -0/+0 | |
| | |\ | |/ / | ||||||
| | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-04 | 0 | -0/+0 | |
| | |\ | ||||||
| | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-05-03 | 0 | -0/+0 | |
| | | |\ | ||||||
| | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-29 | 0 | -0/+0 | |
| | | | |\ | ||||||
| | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-28 | 0 | -0/+0 | |
| | | | | |\ | ||||||
| | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-27 | 0 | -0/+0 | |
| | | | | | |\ | ||||||
| | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-25 | 0 | -0/+0 | |
| | | | | | | |\ | ||||||
| | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-21 | 0 | -0/+0 | |
| | | | | | | | |\ | ||||||
| | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-19 | 0 | -0/+0 | |
| | | | | | | | | |\ | | | | | | | | |/ / | ||||||
| | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-15 | 0 | -0/+0 | |
| | | | | | | | | |\ | | | | | | | | |/ / | ||||||
| | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-13 | 0 | -0/+0 | |
| | | | | | | | | |\ | ||||||
| | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-07 | 0 | -0/+0 | |
| | | | | | | | | | |\ | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-07 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-05 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-04 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-04-01 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-31 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / | ||||||
| | | | | | | | | | | * | merge in honeycomb-mr1-release history after reset to honeycomb-mr1 | The Android Automerger | 2011-03-28 | 0 | -0/+0 | |
| | | | | | | | | | | |\ | | | | | | | | | | |/ / |