aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Track LocaleManager API changesTor Norbye2015-01-272-3/+4
* Merge changes I87b5b309,Id23d941c into studio-1.1-devSiva Velusamy2015-01-143-211/+1
|\
| * Update adt plugin's manifest to use lombok 0.2.3Siva Velusamy2015-01-141-1/+1
| * Remove obsolete p2gen folderSiva Velusamy2015-01-142-210/+0
|/
* Merge "Update Eclipse POM" into studio-1.1-devTor Norbye2015-01-131-1/+1
|\
| * Update Eclipse POMTor Norbye2015-01-131-1/+1
|/
* Merge "Use Lombok 0.2.3 for ADT plugin" into studio-1.1-devTor Norbye2015-01-072-2/+2
|\
| * Use Lombok 0.2.3 for ADT pluginTor Norbye2015-01-072-2/+2
|/
* Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-206-16/+16
|\
| * Update ADT with ASM 5.0.3Tor Norbye2014-12-196-16/+16
|/
* Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-170-0/+0
|\
| * Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-151-3/+15
| |\
| | * find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
| |/
* | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
|\ \
| * | Minor improvements to systrace options dialogSiva Velusamy2014-12-161-24/+57
|/ /
* | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-160-0/+0
|\ \ | |/
| * Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-1555-79/+79
| |\
| | * Update ADT & SDK Tools to 24.0.2Tor Norbye2014-12-1555-79/+79
| |/
* | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-164-169/+3
|\ \ | |/
| * Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-154-169/+3
| |\
| | * Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
| |/
* | Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-164-3/+169
|\ \ | |/
| * Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-114-3/+169
| |\
| | * 82393: Fix template instantiation in ADTTor Norbye2014-12-114-3/+169
| |/
* | Merge "find_java.bat now uses env var instead of find" into studio-1.1-devDavid Herman2014-12-151-3/+15
|\ \
| * | find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
* | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.1-devTor Norbye2014-12-1555-79/+79
|\ \ \
| * | | Update ADT & SDK Tools to 24.0.2Tor Norbye2014-12-1555-79/+79
* | | | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.1-devTor Norbye2014-12-154-169/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 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
|\ \ | |/
generated by cgit v1.1 at 2024-06-30 14:06:57 +0000