aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* emulator/opengl: Remove compiler warnings.David 'Digit' Turner2014-10-303-2/+4
* emulator/opengl/emugen: Small cleanup of autogenerated sources.David 'Digit' Turner2014-10-307-52/+49
* emulator/opengl: Add emugen test suite.David 'Digit' Turner2014-10-3022-0/+629
* Merge "Update Guava 15.0 -> 17.0" into studio-1.0-dev automerge: ffe2a60Siva Velusamy2014-10-275-13/+30
|\
| * Merge "Update Guava 15.0 -> 17.0" into studio-1.0-devSiva Velusamy2014-10-275-13/+30
| |\
| | * Merge "Update Guava 15.0 -> 17.0" into studio-1.0-devSiva Velusamy2014-10-275-13/+30
| | |\
| | | * Update Guava 15.0 -> 17.0Siva Velusamy2014-10-275-13/+30
| | |/
* | | Merge "Handle empty data parameter in glTexSubImage2D"bohu2014-10-211-1/+1
|\ \ \
| * | | Handle empty data parameter in glTexSubImage2Dbohu2014-10-171-1/+1
* | | | Merge "Handle empty length parameter on decoder side"bohu2014-10-211-0/+1
|\ \ \ \
| * | | | Handle empty length parameter on decoder sidebohu2014-10-171-0/+1
| |/ / /
* | | | Merge "Properly reset source code buffer"bohu2014-10-211-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Properly reset source code bufferbohu2014-10-171-0/+1
|/ / /
* | | Merge "find_java: new method to search in a custom path" into studio-1.0-dev ...David Herman2014-10-140-0/+0
|\ \ \ | |/ /
| * | Merge "find_java: new method to search in a custom path" into studio-1.0-devDavid Herman2014-10-142-1/+17
| |\ \ | | |/
* | | Merge "find_java.sln (and related project files) updated" into studio-1.0-dev...David Herman2014-10-140-0/+0
|\ \ \ | |/ /
| * | Merge "find_java.sln (and related project files) updated" into studio-1.0-devDavid Herman2014-10-1414-803/+508
| |\ \
* | \ \ Merge "find_java: new method to search in a custom path" into studio-1.0-devDavid Herman2014-10-102-1/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "find_java: new method to search in a custom path" into studio-1.0-devDavid Herman2014-10-102-1/+17
| |\ \ \ | | |_|/ | |/| |
| | * | find_java: new method to search in a custom pathDavid Herman2014-10-102-1/+17
* | | | Merge "find_java.sln (and related project files) updated" into studio-1.0-devDavid Herman2014-10-1014-803/+508
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge "find_java.sln (and related project files) updated" into studio-1.0-devDavid Herman2014-10-1014-803/+508
| |\ \ | | |/
| | * find_java.sln (and related project files) updatedDavid Herman2014-10-1014-803/+508
| |/
* | Merge changes Ifa8c73ee,If0002fe1,I6659fe69,I15f4caacDavid 'Digit' Turner2014-09-294-178/+192
|\ \
| * | emulator/opengl/emugen: Use local variables for parameters.David 'Digit' Turner2014-09-251-83/+100
| * | emulator/opengl/emugen: Move pointer increment out of case statements.David 'Digit' Turner2014-09-251-8/+9
| * | emulator/opengl/emugen: Introduce helper macros.David 'Digit' Turner2014-09-251-8/+17
| * | emulator/opengl/emugen: Remove accessor functions.David 'Digit' Turner2014-09-254-79/+66
|/ /
* | Merge "emulator/opengl/emugen: Ensure correct buffer alignment."David 'Digit' Turner2014-09-252-4/+149
|\ \
| * | emulator/opengl/emugen: Ensure correct buffer alignment.David 'Digit' Turner2014-09-242-4/+149
* | | Merge "Adjust ADT to new ITestRunListener changes." into studio-1.0-devSiva Velusamy2014-09-232-10/+33
|\ \ \ | | |/ | |/|
| * | Merge "Adjust ADT to new ITestRunListener changes." into studio-1.0-devSiva Velusamy2014-09-232-10/+33
| |\ \
| | * | Adjust ADT to new ITestRunListener changes.Brett Chabot2014-09-232-10/+33
| |/ /
* | | Merge "FindJava2+WinLauncher2 MFC app for Windows." into idea133Raphael Moll2014-09-1928-0/+2741
|\ \ \ | |/ / | | / | |/ |/|
| * Merge "FindJava2+WinLauncher2 MFC app for Windows." into idea133Raphael Moll2014-09-1928-0/+2741
| |\
| | * FindJava2+WinLauncher2 MFC app for Windows.Raphael Moll2014-09-1628-0/+2741
| |/
* | Merge "emulator/opengl/emgen: Fix debug output of floating point values."David 'Digit' Turner2014-09-171-7/+2
|\ \
| * | emulator/opengl/emgen: Fix debug output of floating point values.David 'Digit' Turner2014-09-171-7/+2
|/ /
* | Merge "emulator/opengl: Add UniqueIntegerMap class."David 'Digit' Turner2014-09-163-0/+329
|\ \
| * | emulator/opengl: Add UniqueIntegerMap class.David 'Digit' Turner2014-09-163-0/+329
|/ /
* | Merge "emulator/opengl/emugen: Use templates to read values from stream."David 'Digit' Turner2014-09-162-73/+249
|\ \
| * | emulator/opengl/emugen: Use templates to read values from stream.David 'Digit' Turner2014-09-162-73/+249
* | | Merge changes If8f42a73,Idbba469aDavid 'Digit' Turner2014-09-165-167/+146
|\ \ \ | |/ / | | / | |/ |/|
| * emulator/opengl/emugl: Remove ispointer field from types definitions.David 'Digit' Turner2014-09-134-95/+101
| * emulator/opengl/emugen: Get rid of VarConverter.David 'Digit' Turner2014-09-132-72/+45
* | Merge "Track lint API changes in the Eclipse lint integration" into idea133Tor Norbye2014-09-1510-26/+34
|\ \ | |/ |/|
| * Track lint API changes in the Eclipse lint integrationTor Norbye2014-09-1510-26/+34
|/
* Merge "Update tools to revision 23.0.4" into idea133Siva Velusamy2014-09-051-1/+1
|\
| * Update tools to revision 23.0.4Raphael Moll2014-09-051-1/+1
|/
* Merge "Update ADT version to 23.0.4" into idea133Raphael Moll2014-09-0353-77/+77
|\