aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge "emulator/opengl/emugen: Move pointer increment out of case statements....Bo Hu2014-11-251-8/+9
|\ \ | |/
| * emulator/opengl/emugen: Move pointer increment out of case statements.David 'Digit' Turner2014-11-251-8/+9
* | Merge "emulator/opengl/emugen: Introduce helper macros." into studio-1.0-devBo Hu2014-11-251-8/+17
|\ \ | |/
| * emulator/opengl/emugen: Introduce helper macros.David 'Digit' Turner2014-11-251-8/+17
* | Merge "emulator/opengl/emugen: Remove accessor functions." into studio-1.0-devBo Hu2014-11-254-79/+66
|\ \ | |/
| * emulator/opengl/emugen: Remove accessor functions.David 'Digit' Turner2014-11-254-79/+66
* | Merge "emulator/opengl/emugen: Ensure correct buffer alignment." into studio-...Bo Hu2014-11-252-4/+149
|\ \ | |/
| * emulator/opengl/emugen: Ensure correct buffer alignment.David 'Digit' Turner2014-11-252-4/+149
* | Merge "emulator/opengl/emgen: Fix debug output of floating point values." int...Bo Hu2014-11-251-7/+2
|\ \ | |/
| * emulator/opengl/emgen: Fix debug output of floating point values.David 'Digit' Turner2014-11-251-7/+2
* | Merge "emulator/opengl: Add UniqueIntegerMap class." into studio-1.0-devBo Hu2014-11-253-0/+329
|\ \ | |/
| * emulator/opengl: Add UniqueIntegerMap class.David 'Digit' Turner2014-11-253-0/+329
* | Merge "emulator/opengl/emugen: Use templates to read values from stream." int...Bo Hu2014-11-252-73/+249
|\ \ | |/
| * emulator/opengl/emugen: Use templates to read values from stream.David 'Digit' Turner2014-11-252-73/+249
* | Merge "emulator/opengl/emugen: Get rid of VarConverter." into studio-1.0-devBo Hu2014-11-252-72/+45
|\ \ | |/
| * emulator/opengl/emugen: Get rid of VarConverter.David 'Digit' Turner2014-11-252-72/+45
* | Merge "emulator/opengl/emugl: Remove ispointer field from types definitions."...Bo Hu2014-11-254-95/+101
|\ \ | |/
| * emulator/opengl/emugl: Remove ispointer field from types definitions.David 'Digit' Turner2014-11-254-95/+101
|/
* Merge "find_java now locates openjdk as well" into studio-1.0-devDavid Herman2014-11-251-1/+4
|\
| * find_java now locates openjdk as wellDavid Herman2014-11-241-1/+4
|/
* Merge "Fixed find_java JAVA_HOME minimum version bug" into studio-1.0-devDavid Herman2014-11-241-8/+5
|\
| * Fixed find_java JAVA_HOME minimum version bugDavid Herman2014-11-241-8/+5
|/
* Merge "Need to revert this one and cherry pick earlier CLs first" into studio...Bo Hu2014-11-1922-629/+0
|\
| * Need to revert this one and cherry pick earlier CLs firstBo Hu2014-11-1822-629/+0
* | Merge "emulator/opengl: Add emugen test suite." into studio-1.0-devBo Hu2014-11-1822-0/+629
|\ \ | |/
| * emulator/opengl: Add emugen test suite.David 'Digit' Turner2014-11-1822-0/+629
|/
* Merge "Properly handle shader program deletion" into studio-1.0-devbohu2014-11-183-1/+42
|\
| * Properly handle shader program deletionbohu2014-11-183-1/+42
|/
* Merge "Properly handle shader deletion" into studio-1.0-devbohu2014-11-183-3/+61
|\
| * Properly handle shader deletionbohu2014-11-183-3/+61
|/
* Merge "handles glGetFloatv with GL_STENCIL_VALUE_MASK etc" into studio-1.0-devbohu2014-11-181-0/+14
|\
| * handles glGetFloatv with GL_STENCIL_VALUE_MASK etcbohu2014-11-181-0/+14
|/
* Merge "Build and package 32/64bit find_java." into studio-1.0-devXavier Ducrohet2014-11-144-15/+21
|\
| * Build and package 32/64bit find_java.Xavier Ducrohet2014-11-074-15/+21
* | Merge "Modifed find_java.bat and build settings" into studio-1.0-devDavid Herman2014-11-142-8/+23
|\ \
| * | Modifed find_java.bat and build settingsDavid Herman2014-11-142-8/+23
|/ /
* | Merge "New -path arg for find_java" into studio-1.0-devDavid Herman2014-11-143-16/+42
|\ \
| * | New -path arg for find_javaDavid Herman2014-10-233-16/+42
* | | Merge "New -error arg for find_java" into studio-1.0-devDavid Herman2014-11-141-6/+32
|\ \ \ | |/ /
| * | New -error arg for find_javaDavid Herman2014-10-231-6/+32
* | | Merge "Added new -minv (version) option to find_java" into studio-1.0-devDavid Herman2014-11-143-47/+85
|\ \ \ | |/ /
| * | Added new -minv (version) option to find_javaDavid Herman2014-10-233-47/+85
* | | Merge "New -jdk option for find_java" into studio-1.0-devDavid Herman2014-11-143-42/+84
|\ \ \ | |/ /
| * | New -jdk option for find_javaDavid Herman2014-10-233-42/+84
* | | Merge "find_java now supports 64-bit builds" into studio-1.0-devDavid Herman2014-11-149-78/+306
|\ \ \ | |/ / | | / | |/ |/|
| * find_java now supports 64-bit buildsDavid Herman2014-10-179-78/+306
* | Merge "Do not include META-INF/maven folder in generated artifact" into studi...Siva Velusamy2014-10-291-0/+20
|\ \
| * | Do not include META-INF/maven folder in generated artifactSiva Velusamy2014-10-291-0/+20
* | | Merge "Bumped tools version number to 23.0.6" into studio-1.0-devVince Harron2014-10-291-1/+1
|\ \ \
| * | | Bumped tools version number to 23.0.6Vince Harron2014-10-291-1/+1
|/ / /