Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge "Merge c80340 from master to r13: Move charmap to hardware properties" ... | Xavier Ducrohet | 2011-08-11 | 9 | -62/+73 | |
| |\ \ | | |/ | ||||||
| | * | Merge c80340 from master to r13: Move charmap to hardware properties | David 'Digit' Turner | 2011-08-05 | 9 | -62/+73 | |
| * | | Merge "merge 62ffc42 from master to r13: Added GTV related keys" into tools_r13 | Xavier Ducrohet | 2011-08-11 | 5 | -14/+84 | |
| |\ \ | | |/ | ||||||
| | * | merge 62ffc42 from master to r13: Added GTV related keys | Maciek Molerus | 2011-08-05 | 5 | -14/+84 | |
| |/ | ||||||
* | | Merge "Fic minor bug, and update docs." | Vladimir Chtchetkine | 2011-08-08 | 2 | -6/+17 | |
|\ \ | ||||||
| * | | Fic minor bug, and update docs. | Vladimir Chtchetkine | 2011-08-08 | 2 | -6/+17 | |
* | | | merge from tools_r13 | The Android Open-Source Project | 2011-08-05 | 0 | -0/+0 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Merge "Fix Windows space-in-path handling for 'emulator'." into tools_r13 | David Turner | 2011-08-05 | 1 | -2/+46 | |
| |\ | ||||||
| | * | Fix Windows space-in-path handling for 'emulator'. | David Turner | 2011-08-04 | 1 | -2/+46 | |
* | | | Merge "Enable QEMUD over pipe." | Vladimir Chtchetkine | 2011-08-05 | 1 | -42/+432 | |
|\ \ \ | ||||||
| * | | | Enable QEMUD over pipe. | Vladimir Chtchetkine | 2011-08-04 | 1 | -42/+432 | |
* | | | | merge from tools_r13 | The Android Open-Source Project | 2011-08-05 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| * | | Merge "Fix window scaling issue." into tools_r13 | David 'Digit' Turner | 2011-08-05 | 1 | -6/+10 | |
| |\ \ | | |/ | ||||||
| | * | Fix window scaling issue. | David 'Digit' Turner | 2011-08-04 | 1 | -6/+10 | |
| * | | Merge "Fix -sysdir handling." into tools_r13 | David 'Digit' Turner | 2011-08-05 | 3 | -2/+14 | |
| |\ \ | | |/ | ||||||
| | * | Fix -sysdir handling. | David 'Digit' Turner | 2011-08-04 | 3 | -2/+14 | |
| * | | Merge "Auto-adjust scale and window position when needed." into tools_r13 | David 'Digit' Turner | 2011-08-05 | 3 | -10/+59 | |
| |\ \ | | |/ | ||||||
| | * | Auto-adjust scale and window position when needed. | David 'Digit' Turner | 2011-08-04 | 3 | -10/+59 | |
| * | | Merge "Fixes dataPartition size problem" into tools_r13 | David Turner | 2011-08-05 | 1 | -1/+4 | |
| |\ \ | | |/ | ||||||
| | * | Fixes dataPartition size problem | Maciek Molerus | 2011-08-04 | 1 | -1/+4 | |
| |/ | ||||||
* | | Merge "Fix Windows space-in-path handling for 'emulator'." | David Turner | 2011-07-16 | 1 | -2/+46 | |
|\ \ | ||||||
| * | | Fix Windows space-in-path handling for 'emulator'. | David Turner | 2011-07-15 | 1 | -2/+46 | |
|/ / | ||||||
* | | Merge "Added GTV related keys" | David Turner | 2011-07-14 | 5 | -14/+84 | |
|\ \ | ||||||
| * | | Added GTV related keys | Maciek Molerus | 2011-07-12 | 5 | -14/+84 | |
|/ / | ||||||
* | | Merge "opengles qemu-pipe perforance on windows" | David Turner | 2011-07-11 | 1 | -2/+20 | |
|\ \ | ||||||
| * | | opengles qemu-pipe perforance on windows | Guy Zadickario | 2011-07-08 | 1 | -2/+20 | |
|/ / | ||||||
* | | Merge "Fix window scaling issue." | David 'Digit' Turner | 2011-07-08 | 1 | -6/+10 | |
|\ \ | ||||||
| * | | Fix window scaling issue. | David 'Digit' Turner | 2011-07-08 | 1 | -6/+10 | |
|/ / | ||||||
* | | Merge "Add new emulator application icons by Roman Nurik" | Tor Norbye | 2011-07-07 | 4 | -0/+0 | |
|\ \ | ||||||
| * | | Add new emulator application icons by Roman Nurik | Tor Norbye | 2011-07-06 | 4 | -0/+0 | |
* | | | Merge "Fix a small bug in the -sysdir handling." | David 'Digit' Turner | 2011-07-07 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Fix a small bug in the -sysdir handling. | David 'Digit' Turner | 2011-07-07 | 1 | -1/+1 | |
* | | | | Merge "hw-pipe-net.c: only support connecting to localhost ports." | David 'Digit' Turner | 2011-07-07 | 1 | -30/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | hw-pipe-net.c: only support connecting to localhost ports. | David 'Digit' Turner | 2011-07-07 | 1 | -30/+4 | |
|/ / / | ||||||
* | | | Merge "Move charmap to hardware properties" | David 'Digit' Turner | 2011-07-06 | 9 | -62/+73 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Move charmap to hardware properties | David 'Digit' Turner | 2011-07-07 | 9 | -62/+73 | |
|/ / | ||||||
* | | Merge "Fix build" | David 'Digit' Turner | 2011-07-05 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix build | David 'Digit' Turner | 2011-07-06 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge "hw-config-defs.h: Remove from source tree + auto-generate" | David 'Digit' Turner | 2011-07-05 | 6 | -324/+70 | |
|\ \ | ||||||
| * | | hw-config-defs.h: Remove from source tree + auto-generate | David 'Digit' Turner | 2011-07-05 | 6 | -324/+70 | |
|/ / | ||||||
* | | Merge "Fix -audio <name> and -no-audio processing." | David 'Digit' Turner | 2011-06-29 | 5 | -10/+21 | |
|\ \ | ||||||
| * | | Fix -audio <name> and -no-audio processing. | David 'Digit' Turner | 2011-06-27 | 5 | -10/+21 | |
|/ / | ||||||
* | | Merge "android-configure.sh: Better platform build detection." | David 'Digit' Turner | 2011-06-23 | 1 | -2/+2 | |
|\ \ | ||||||
| * | | android-configure.sh: Better platform build detection. | David 'Digit' Turner | 2011-06-23 | 1 | -2/+2 | |
* | | | Merge "Fix -sysdir handling." | David 'Digit' Turner | 2011-06-23 | 2 | -1/+13 | |
|\ \ \ | |/ / | ||||||
| * | | Fix -sysdir handling. | David 'Digit' Turner | 2011-06-23 | 2 | -1/+13 | |
|/ / | ||||||
* | | Merge "win32: do not use -mno-cygwin when building" | David 'Digit' Turner | 2011-06-23 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | win32: do not use -mno-cygwin when building | David 'Digit' Turner | 2011-06-23 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge "qemu pipes: fix Windows network pipes." | David 'Digit' Turner | 2011-06-23 | 1 | -12/+8 | |
|\ \ | ||||||
| * | | qemu pipes: fix Windows network pipes. | David 'Digit' Turner | 2011-06-21 | 1 | -12/+8 | |
|/ / |