aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Update ADT version to 23.0.4Raphael Moll2014-09-0353-77/+77
|/
* Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-09-021-11/+12
|\
| * Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-08-291-11/+12
| |\
| | * Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| |/
* | Merge "emulator/opengl: Cleanup build files + remove obsolete tests."David 'Digit' Turner2014-08-2962-6756/+84
|\ \ | |/ |/|
| * emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-2762-6756/+84
|/
* Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
|\
| * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-161-1/+1
| |\
| | * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| |/
* | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
|\ \ | |/
| * Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| |\
| | * Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
| |/
* | Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
|\ \ | |/
| * Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
| |\
| | * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
| |/
* | Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-233-4/+44
|\ \
| * | Support dynamic lib name without ".dylib" on MacTina Zhang2014-07-273-4/+44
|/ /
* | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
|\ \ | |/
| * Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
| |\
| | * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-4/+2
| |/
* | Merge "Merge commit 'ae461d3' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \
| * \ Merge commit 'ae461d3' into mmergeSiva Velusamy2014-07-234-239/+0
| |\ \ |/ / / | | _
| * Merge "monitor: Remove old build scripts and instructions" into idea133Siva Velusamy2014-07-234-230/+0
| |\
| | * monitor: Remove old build scripts and instructionsSiva Velusamy2014-07-234-230/+0
| |/