aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
|/ / /
* | | Merge "Fix Eclipse build." into studio-1.1-devXavier Ducrohet2014-12-132-0/+2
|\ \ \
| * | | Fix Eclipse build.Xavier Ducrohet2014-12-122-0/+2
|/ / /
* | | Merge "82393: Fix template instantiation in ADT" into studio-1.1-devTor Norbye2014-12-114-3/+169
|\ \ \
| * | | 82393: Fix template instantiation in ADTTor Norbye2014-12-114-3/+169
|/ / /
* | | Merge "Update ADT to version 24.0.1" into studio-1.0-devTor Norbye2014-12-110-0/+0
|\ \ \ | | |/ | |/|
| * | Merge "Update ADT to version 24.0.1" into studio-1.0-devTor Norbye2014-12-1053-77/+77
| |\ \
| | * | Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
| |/ /
* | | Merge "Update SDK Tools to 24.0.1" into studio-1.0-devXavier Ducrohet2014-12-111-1/+1
|\ \ \ | |/ /
| * | Merge "Update SDK Tools to 24.0.1" into studio-1.0-devXavier Ducrohet2014-12-101-1/+1
| |\ \
| | * | Update SDK Tools to 24.0.1Xavier Ducrohet2014-12-091-1/+1
* | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-devDavid Herman2014-12-110-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-devDavid Herman2014-12-101-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fixed find_java syntax error on 32-bit machinesDavid Herman2014-12-101-1/+1
| |/ /
* | | Merge "Update ADT to version 24.0.1" into studio-1.1-devTor Norbye2014-12-1053-77/+77
|\ \ \ | |_|/ |/| |
| * | Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
|/ /
* | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-devDavid Herman2014-12-101-1/+1
|\ \ | |/ |/|
| * Fixed find_java syntax error on 32-bit machinesDavid Herman2014-12-091-1/+1
|/
* Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
|\
| * Update ADT version to 24.0.0.Tor Norbye2014-12-0353-77/+77
* | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
|\ \ | |/
| * Update SDK tools version to 24.0.0.Tor Norbye2014-12-031-1/+1
|/
* Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into studio-1....Tor Norbye2014-12-023-7/+8
|\
| * 80481: Update Gradle Export from Eclipse to handle 1.0Tor Norbye2014-12-023-7/+8
|/
* Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
|\
| * Update ADT version to 23.0.6Tor Norbye2014-11-2653-77/+77
* | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
|\ \ | |/
| * 72760: Lint errors prevent exporting of applicationTor Norbye2014-11-267-11/+78
|/
* Merge "Correctly set error code" into studio-1.0-devbohu2014-11-252-4/+28
|\
| * Correctly set error codebohu2014-11-252-4/+28
* | Merge "Validate glClear mask" into studio-1.0-devbohu2014-11-251-0/+3
|\ \ | |/
| * Validate glClear maskbohu2014-11-251-0/+3
* | Merge "Check and return correct error code" into studio-1.0-devbohu2014-11-251-3/+5
|\ \ | |/
| * Check and return correct error codebohu2014-11-251-3/+5
* | Merge "validate glBufferData's usage parameter" into studio-1.0-devbohu2014-11-253-0/+12
|\ \ | |/
| * validate glBufferData's usage parameterbohu2014-11-253-0/+12
* | Merge "Detach texture or renderbuffer when deleting them" into studio-1.0-devbohu2014-11-252-1/+29
|\ \ | |/
| * Detach texture or renderbuffer when deleting thembohu2014-11-252-1/+29
* | Merge "emulator/opengl: Fix glShaderSource() signature." into studio-1.0-devBo Hu2014-11-2510-9/+10
|\ \ | |/
| * emulator/opengl: Fix glShaderSource() signature.David 'Digit' Turner2014-11-2510-9/+10
* | Merge "emulator/opengl/emugen: Add new 'flushOnEncode' entry point flag." int...Bo Hu2014-11-2522-2/+71
|\ \ | |/
| * emulator/opengl/emugen: Add new 'flushOnEncode' entry point flag.David 'Digit' Turner2014-11-2522-2/+71
* | Merge "emulator/opengl: Remove compiler warnings." into studio-1.0-devBo Hu2014-11-253-2/+4
|\ \ | |/
| * emulator/opengl: Remove compiler warnings.David 'Digit' Turner2014-11-253-2/+4
* | Merge "emulator/opengl/emugen: Small cleanup of autogenerated sources." into ...Bo Hu2014-11-257-52/+49
|\ \ | |/
| * emulator/opengl/emugen: Small cleanup of autogenerated sources.David 'Digit' Turner2014-11-257-52/+49
* | Merge "emulator/opengl: Add emugen test suite." into studio-1.0-devBo Hu2014-11-2522-0/+629
|\ \ | |/
| * emulator/opengl: Add emugen test suite.David 'Digit' Turner2014-11-2522-0/+629
* | Merge "emulator/opengl/emugen: Use local variables for parameters." into stud...Bo Hu2014-11-251-83/+100
|\ \ | |/
| * emulator/opengl/emugen: Use local variables for parameters.David 'Digit' Turner2014-11-251-83/+100