aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Hook up framebuffer changes with UI windowVladimir Chtchetkine2011-01-137-40/+75
* Merge "Make the emulator find the skins in their new location."Xavier Ducrohet2011-01-071-1/+1
|\
| * Make the emulator find the skins in their new location.Xavier Ducrohet2011-01-071-1/+1
|/
* Merge "Fix Darwin build."Xavier Ducrohet2011-01-062-3/+3
|\
| * Fix Darwin build.David 'Digit' Turner2011-01-062-3/+3
|/
* Merge "Fix tracing segfault due to improper upstream integrate."David 'Digit' Turner2011-01-061-29/+9
|\
| * Fix tracing segfault due to improper upstream integrate.David 'Digit' Turner2011-01-061-29/+9
|/
* Merge "Fix tracing bug when built as 64-bit program."David 'Digit' Turner2011-01-061-1/+1
|\
| * Fix tracing bug when built as 64-bit program.David 'Digit' Turner2011-01-061-1/+1
|/
* Merge "upstream: integrate block changes"David 'Digit' Turner2011-01-0634-1754/+5284
|\
| * upstream: integrate block changesDavid 'Digit' Turner2011-01-0234-1754/+5284
* | Merge "Fix buffer overwrite caused by typo."David 'Digit' Turner2011-01-061-1/+1
|\ \
| * | Fix buffer overwrite caused by typo.David 'Digit' Turner2011-01-061-1/+1
|/ /
* | Merge "fix OS X build: missing comma"David 'Digit' Turner2011-01-031-1/+1
|\ \
| * | fix OS X build: missing commaDavid 'Digit' Turner2011-01-031-1/+1
|/ /
* | Merge changes I30b39053,If7896d65,I364390a7,Ibd4321ed,Ifc00b124,I805c1a24,Ie9...David 'Digit' Turner2011-01-0240-1544/+2464
|\ \ | |/
| * qemu-sockets-android.c: Add inet_dgram_optsDavid 'Digit' Turner2011-01-021-0/+112
| * qemu-sockets-android.c: Add support for socket=<number> option.David 'Digit' Turner2011-01-022-0/+77
| * monitor.h: cleanupDavid 'Digit' Turner2011-01-021-3/+0
| * upstream: Move bottom-half handlers to async.cDavid 'Digit' Turner2011-01-024-212/+221
| * sockets.h: Add SOCKET_LIST_DGRAMDavid 'Digit' Turner2011-01-022-1/+5
| * upstream: qemu-io.cDavid 'Digit' Turner2011-01-021-2/+5
| * upstream: update hxtoolDavid 'Digit' Turner2011-01-021-2/+60
| * upstream: minor json-lexer.c integration.David 'Digit' Turner2011-01-021-3/+7
| * upstream: minor integrationDavid 'Digit' Turner2011-01-022-31/+46
| * Add -audio-test-out option to the core.David 'Digit' Turner2011-01-026-3/+138
| * Fix upstream audio bug: can't play with two soft voices.David 'Digit' Turner2011-01-022-2/+5
| * Remove obsolete -audio-in and -audio-out options.David 'Digit' Turner2011-01-026-138/+0
| * upstream: audio sub-system improvements.David 'Digit' Turner2011-01-0218-1147/+1788
* | Merge "android-configure.sh: Use 32-bit toolchain if present."David 'Digit' Turner2011-01-021-5/+14
|\ \ | |/
| * android-configure.sh: Use 32-bit toolchain if present.David 'Digit' Turner2011-01-021-5/+14
|/
* Merge "Pass bits per pixel tu UI when it gets attached to core framebuffer"Vladimir Chtchetkine2010-12-217-14/+76
|\
| * Pass bits per pixel tu UI when it gets attached to core framebufferVladimir Chtchetkine2010-12-217-14/+76
|/
* Merge "Resubmit framebuffer service implementation"Vladimir Chtchetkine2010-12-2020-22/+850
|\
| * Resubmit framebuffer service implementationVladimir Chtchetkine2010-12-2020-22/+850
|/
* Merge "Do not try to run the audio config tests."David 'Digit' Turner2010-12-171-1/+1
|\
| * Do not try to run the audio config tests.David 'Digit' Turner2010-12-171-1/+1
|/
* Merge "Add 'gsm signal' command, to set rssi and ber"Tim Baverstock2010-12-173-2/+86
|\
| * Add 'gsm signal' command, to set rssi and berTim Baverstock2010-12-153-2/+86
* | Merge "Implement core display deriving it from android display"Vladimir Chtchetkine2010-12-154-0/+131
|\ \ | |/ |/|
| * Implement core display deriving it from android displayVladimir Chtchetkine2010-12-144-0/+131
* | Merge "Send unsolicited time response to first signal strength query after lo...Tim Baverstock2010-12-157-7/+67
|\ \ | |/ |/|
| * Send unsolicited time response to first signal strength query after loadvmTim Baverstock2010-12-147-7/+67
|/
* Merge "Submit merged"Vladimir Chtchetkine2010-12-0610-31/+808
|\
| * Submit mergedVladimir Chtchetkine2010-12-0610-31/+808
|/
* Merge "Add -no-snapshot-load option to permit reboot."Tim Baverstock2010-12-034-12/+32
|\
| * Add -no-snapshot-load option to permit reboot.Tim Baverstock2010-12-024-12/+32
* | Merge "Correct command arguments for 'geo fix', but support backward compatib...Tim Baverstock2010-12-032-17/+26
|\ \ | |/ |/|
| * Correct command arguments for 'geo fix', but support backward compatible use.Tim Baverstock2010-12-012-17/+26
* | Merge "Augment the auto-loadvm behaviour with corresponding auto-savevm-on-ex...Tim Baverstock2010-12-026-14/+49
|\ \