aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix build break: make sure darwin build picks up on required declarati...Vladimir Chtchetkine2011-08-242-3/+3
|\
| * Fix build break: make sure darwin build picks up on required declarationsVladimir Chtchetkine2011-08-242-3/+3
* | Merge "Fix the build by #ifdefing linux-only includes"Vladimir Chtchetkine2011-08-241-2/+4
|\ \ | |/
| * Fix the build by #ifdefing linux-only includesVladimir Chtchetkine2011-08-241-2/+4
* | Merge "emulator: probe shared library search path"David 'Digit' Turner2011-08-241-0/+128
|\ \
| * | emulator: probe shared library search pathDavid 'Digit' Turner2011-08-241-0/+128
* | | Merge "android-configure.sh: Add OpenGLES support"David 'Digit' Turner2011-08-241-1/+111
|\ \ \ | |/ / | | / | |/ |/|
| * android-configure.sh: Add OpenGLES supportDavid 'Digit' Turner2011-08-241-1/+111
|/
* Merge "Avoid conflicts with SDL_CONFIG variable."David 'Digit' Turner2011-08-242-2/+3
|\
| * Avoid conflicts with SDL_CONFIG variable.David 'Digit' Turner2011-08-242-2/+3
* | Merge "Add DLL-loading head <android/utils/dll.h>"David 'Digit' Turner2011-08-245-0/+300
|\ \ | |/
| * Add DLL-loading head <android/utils/dll.h>David 'Digit' Turner2011-08-245-0/+300
|/
* Merge "Video capturing code for Linux, and Windows"Vladimir Chtchetkine2011-08-249-2/+1474
|\
| * Video capturing code for Linux, and WindowsVladimir Chtchetkine2011-08-189-2/+1474
* | Merge "Revert "Revert "Merge c80340 from master to r13: Move charmap to hardw...Xavier Ducrohet2011-08-229-62/+73
|\ \
| * | Revert "Revert "Merge c80340 from master to r13: Move charmap to hardware pro...Xavier Ducrohet2011-08-229-62/+73
|/ /
* | Merge "Fix an emulator crash due to closed qemud pipe"Vladimir Chtchetkine2011-08-191-25/+51
|\ \
| * | Fix an emulator crash due to closed qemud pipeVladimir Chtchetkine2011-08-181-25/+51
|/ /
* | merge from tools_r13The Android Open-Source Project2011-08-180-0/+0
|\ \ | |/ |/|
| * Merge "Fix internet connectivity of emulator over proxy" into tools_r13David Turner2011-08-181-7/+12
| |\
| | * Fix internet connectivity of emulator over proxyMatthias Thomae2011-08-181-7/+12
| |/
* | Merge "opengles: improve throughput of TCP socket"David Turner2011-08-151-16/+16
|\ \
| * | opengles: improve throughput of TCP socketDavid Turner2011-08-151-16/+16
|/ /
* | Merge "Fix internet connectivity of emulator over proxy"David Turner2011-08-131-7/+12
|\ \
| * | Fix internet connectivity of emulator over proxyMatthias Thomae2011-08-101-7/+12
* | | Merge "Fix fron report on unexpected qemud char channel close."Vladimir Chtchetkine2011-08-121-1/+15
|\ \ \
| * | | Fix fron report on unexpected qemud char channel close.Vladimir Chtchetkine2011-08-121-1/+15
* | | | Merge "Disable trace."Vladimir Chtchetkine2011-08-121-1/+1
|\ \ \ \ | |/ / /
| * | | Disable trace.Vladimir Chtchetkine2011-08-121-1/+1
| |/ /
* | | merge from tools_r13The Android Open-Source Project2011-08-119-73/+62
|\ \ \ | | |/ | |/|
| * | Merge "Revert "Merge c80340 from master to r13: Move charmap to hardware prop...Xavier Ducrohet2011-08-119-73/+62
| |\ \
| | * | Revert "Merge c80340 from master to r13: Move charmap to hardware properties"...Xavier Ducrohet2011-08-119-73/+62
* | | | merge from tools_r13The Android Open-Source Project2011-08-110-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "Merge c80340 from master to r13: Move charmap to hardware properties" ...Xavier Ducrohet2011-08-119-62/+73
| |\ \ | | |/
| | * Merge c80340 from master to r13: Move charmap to hardware propertiesDavid 'Digit' Turner2011-08-059-62/+73
| * | Merge "merge 62ffc42 from master to r13: Added GTV related keys" into tools_r13Xavier Ducrohet2011-08-115-14/+84
| |\ \ | | |/
| | * merge 62ffc42 from master to r13: Added GTV related keysMaciek Molerus2011-08-055-14/+84
| |/
* | Merge "Fic minor bug, and update docs."Vladimir Chtchetkine2011-08-082-6/+17
|\ \
| * | Fic minor bug, and update docs.Vladimir Chtchetkine2011-08-082-6/+17
* | | merge from tools_r13The Android Open-Source Project2011-08-050-0/+0
|\ \ \ | |/ / |/| / | |/
| * Merge "Fix Windows space-in-path handling for 'emulator'." into tools_r13David Turner2011-08-051-2/+46
| |\
| | * Fix Windows space-in-path handling for 'emulator'.David Turner2011-08-041-2/+46
* | | Merge "Enable QEMUD over pipe."Vladimir Chtchetkine2011-08-051-42/+432
|\ \ \
| * | | Enable QEMUD over pipe.Vladimir Chtchetkine2011-08-041-42/+432
* | | | merge from tools_r13The Android Open-Source Project2011-08-050-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge "Fix window scaling issue." into tools_r13David 'Digit' Turner2011-08-051-6/+10
| |\ \ | | |/
| | * Fix window scaling issue.David 'Digit' Turner2011-08-041-6/+10
| * | Merge "Fix -sysdir handling." into tools_r13David 'Digit' Turner2011-08-053-2/+14
| |\ \ | | |/
| | * Fix -sysdir handling.David 'Digit' Turner2011-08-043-2/+14
| * | Merge "Auto-adjust scale and window position when needed." into tools_r13David 'Digit' Turner2011-08-053-10/+59
| |\ \ | | |/