aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Delete sdl-1.2.12Jesse Hall2012-07-23658-181463/+0
* Merge "Switch to sdl 1.2.15 and build from source on osx"Jesse Hall2012-07-233-19/+3
|\
| * Switch to sdl 1.2.15 and build from source on osxJesse Hall2012-07-233-19/+3
|/
* Merge "Remove link dependency on SDL_audio.c which we don't build"Jesse Hall2012-07-231-1/+4
|\
| * Remove link dependency on SDL_audio.c which we don't buildJesse Hall2012-07-231-1/+4
|/
* Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"Jesse Hall2012-07-2326-41/+1700
|\
| * Apply Android changes from sdl-1.2.12 to sdl-1.2.15Jesse Hall2012-07-2226-41/+1700
* | Merge changes I505c4aea,I2ae0529cJesse Hall2012-07-231369-17/+393387
|\ \ | |/
| * Import SDL release-1.2.15Jesse Hall2012-07-221367-0/+393331
| * Handle SDL windows with BGRA colorJesse Hall2012-07-222-17/+56
|/
* Merge "Use a per-process server address for the GLES server"Jesse Hall2012-07-123-26/+16
|\
| * Use a per-process server address for the GLES serverJesse Hall2012-07-113-26/+16
|/
* Merge "[MIPS] Fix startup segfault in emulator64-mips"Andrew Hsieh2012-06-212-6/+4
|\
| * [MIPS] Fix startup segfault in emulator64-mipsDuane Sand2012-06-212-6/+4
|/
* Merge "Force emulator to quit if it's built w/o global register variable supp...Andrew Hsieh2012-06-115-11/+28
|\
| * Force emulator to quit if it's built w/o global register variable supportAndrew Hsieh2012-06-125-11/+28
|/
* Merge "[MIPS] TLBRET_DIRTY is a valid return value from get_physical_address"Andrew Hsieh2012-06-081-1/+1
|\
| * [MIPS] TLBRET_DIRTY is a valid return value from get_physical_addressBhanu Chetlapalli2012-06-081-1/+1
|/
* Merge "[MIPS] Clear softfpu status before emulating FPU instructions"Andrew Hsieh2012-06-081-0/+16
|\
| * [MIPS] Clear softfpu status before emulating FPU instructionsBhanu Chetlapalli2012-06-081-0/+16
|/
* Merge "[MIPS] Add Goldfish target support"Andrew Hsieh2012-06-0812-22/+445
|\
| * [MIPS] Add Goldfish target supportBhanu Chetlapalli2012-06-0712-22/+445
|/
* Merge "Mark gles pipe connected after callback invoked"Andrew Hsieh2012-06-061-2/+16
|\
| * Mark gles pipe connected after callback invokedJiang, Yunhong2012-06-011-2/+16
* | Merge "[MIPS] Copy vmlinux to kernel-qemu"Andrew Hsieh2012-06-051-2/+2
|\ \
| * | [MIPS] Copy vmlinux to kernel-qemuBhanu Chetlapalli2012-06-051-2/+2
* | | Merge "Track started and initialized states separately"Jesse Hall2012-06-051-4/+21
|\ \ \ | |/ / |/| |
| * | Track started and initialized states separatelyJesse Hall2012-06-051-4/+21
|/ /
* | Merge "fix BUILD_DEBUG_EMULATOR build"Andrew Hsieh2012-05-313-3/+8
|\ \
| * | fix BUILD_DEBUG_EMULATOR buildIliyan Malchev2012-06-013-3/+8
|/ /
* | Merge "replace _exit() with exit()"Andrew Hsieh2012-05-314-7/+7
|\ \ | |/ |/|
| * replace _exit() with exit()Iliyan Malchev2012-06-014-7/+7
|/
* Merge "Fixed prebuilt path and toolchain names"Andrew Hsieh2012-05-302-25/+21
|\
| * Fixed prebuilt path and toolchain namesAndrew Hsieh2012-05-302-25/+21
|/
* Merge "[MIPS] Add MIPS support to build-kernel.sh"Andrew Hsieh2012-05-292-3/+23
|\
| * [MIPS] Add MIPS support to build-kernel.shBhanu Chetlapalli2012-05-212-3/+23
* | Merge "Replace i686-android-linux with i686-linux-android"Jean-Baptiste Queru2012-05-242-3/+3
|\ \ | |/ |/|
| * Replace i686-android-linux with i686-linux-androidH.J. Lu2012-05-032-3/+3
* | Merge "Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot ...Vladimir Chtchetkine2012-05-211-0/+9
|\ \
| * | Use -qemu -lcd-density parameter for setting qemu.sf.lcd_density boot property.Vladimir Chtchetkine2012-05-181-0/+9
| | |
| \ \
*-. \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-160-0/+0
|\ \ \ \ | |/ / /
| * | | merge in jb-release history after reset to jb-devThe Android Automerger2012-04-250-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-230-0/+0
| | |\ \ \
| | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-160-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-100-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-090-0/+0
| | | | | |\ \ \
| | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-050-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-040-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-04-020-0/+0
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ merge in jb-release history after reset to masterThe Android Automerger2012-03-290-0/+0
| | | | | | | | | |\ \ \