Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fix the darwin build" | Vladimir Chtchetkine | 2011-08-24 | 2 | -2/+5 |
|\ | |||||
| * | Fix the darwin build | Vladimir Chtchetkine | 2011-08-24 | 2 | -2/+5 |
* | | Merge "Fix build break: make sure darwin build picks up on required declarati... | Vladimir Chtchetkine | 2011-08-24 | 2 | -3/+3 |
|\ \ | |/ | |||||
| * | Fix build break: make sure darwin build picks up on required declarations | Vladimir Chtchetkine | 2011-08-24 | 2 | -3/+3 |
* | | Merge "Fix the build by #ifdefing linux-only includes" | Vladimir Chtchetkine | 2011-08-24 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Fix the build by #ifdefing linux-only includes | Vladimir Chtchetkine | 2011-08-24 | 1 | -2/+4 |
* | | Merge "emulator: probe shared library search path" | David 'Digit' Turner | 2011-08-24 | 1 | -0/+128 |
|\ \ | |||||
| * | | emulator: probe shared library search path | David 'Digit' Turner | 2011-08-24 | 1 | -0/+128 |
* | | | Merge "android-configure.sh: Add OpenGLES support" | David 'Digit' Turner | 2011-08-24 | 1 | -1/+111 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | android-configure.sh: Add OpenGLES support | David 'Digit' Turner | 2011-08-24 | 1 | -1/+111 |
|/ | |||||
* | Merge "Avoid conflicts with SDL_CONFIG variable." | David 'Digit' Turner | 2011-08-24 | 2 | -2/+3 |
|\ | |||||
| * | Avoid conflicts with SDL_CONFIG variable. | David 'Digit' Turner | 2011-08-24 | 2 | -2/+3 |
* | | Merge "Add DLL-loading head <android/utils/dll.h>" | David 'Digit' Turner | 2011-08-24 | 5 | -0/+300 |
|\ \ | |/ | |||||
| * | Add DLL-loading head <android/utils/dll.h> | David 'Digit' Turner | 2011-08-24 | 5 | -0/+300 |
|/ | |||||
* | Merge "Video capturing code for Linux, and Windows" | Vladimir Chtchetkine | 2011-08-24 | 9 | -2/+1474 |
|\ | |||||
| * | Video capturing code for Linux, and Windows | Vladimir Chtchetkine | 2011-08-18 | 9 | -2/+1474 |
* | | Merge "Revert "Revert "Merge c80340 from master to r13: Move charmap to hardw... | Xavier Ducrohet | 2011-08-22 | 9 | -62/+73 |
|\ \ | |||||
| * | | Revert "Revert "Merge c80340 from master to r13: Move charmap to hardware pro... | Xavier Ducrohet | 2011-08-22 | 9 | -62/+73 |
|/ / | |||||
* | | Merge "Fix an emulator crash due to closed qemud pipe" | Vladimir Chtchetkine | 2011-08-19 | 1 | -25/+51 |
|\ \ | |||||
| * | | Fix an emulator crash due to closed qemud pipe | Vladimir Chtchetkine | 2011-08-18 | 1 | -25/+51 |
|/ / | |||||
* | | merge from tools_r13 | The Android Open-Source Project | 2011-08-18 | 0 | -0/+0 |
|\ \ | |/ |/| | |||||
| * | Merge "Fix internet connectivity of emulator over proxy" into tools_r13 | David Turner | 2011-08-18 | 1 | -7/+12 |
| |\ | |||||
| | * | Fix internet connectivity of emulator over proxy | Matthias Thomae | 2011-08-18 | 1 | -7/+12 |
| |/ | |||||
* | | Merge "opengles: improve throughput of TCP socket" | David Turner | 2011-08-15 | 1 | -16/+16 |
|\ \ | |||||
| * | | opengles: improve throughput of TCP socket | David Turner | 2011-08-15 | 1 | -16/+16 |
|/ / | |||||
* | | Merge "Fix internet connectivity of emulator over proxy" | David Turner | 2011-08-13 | 1 | -7/+12 |
|\ \ | |||||
| * | | Fix internet connectivity of emulator over proxy | Matthias Thomae | 2011-08-10 | 1 | -7/+12 |
* | | | Merge "Fix fron report on unexpected qemud char channel close." | Vladimir Chtchetkine | 2011-08-12 | 1 | -1/+15 |
|\ \ \ | |||||
| * | | | Fix fron report on unexpected qemud char channel close. | Vladimir Chtchetkine | 2011-08-12 | 1 | -1/+15 |
* | | | | Merge "Disable trace." | Vladimir Chtchetkine | 2011-08-12 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Disable trace. | Vladimir Chtchetkine | 2011-08-12 | 1 | -1/+1 |
| |/ / | |||||
* | | | merge from tools_r13 | The Android Open-Source Project | 2011-08-11 | 9 | -73/+62 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge "Revert "Merge c80340 from master to r13: Move charmap to hardware prop... | Xavier Ducrohet | 2011-08-11 | 9 | -73/+62 |
| |\ \ | |||||
| | * | | Revert "Merge c80340 from master to r13: Move charmap to hardware properties"... | Xavier Ducrohet | 2011-08-11 | 9 | -73/+62 |
* | | | | merge from tools_r13 | The Android Open-Source Project | 2011-08-11 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | 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 |
| |\ \ | | |/ |