aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix tools_r10 SDK build." into tools_r10tools_r11Raphael2011-05-021-0/+1
|\
| * Fix tools_r10 SDK build.Raphael2011-05-021-0/+1
|/
* Merge "SDK Manager: fix extra package update detection." into tools_r10Raphael Moll2011-04-182-16/+37
|\
| * SDK Manager: fix extra package update detection.Raphael Moll2011-04-172-16/+37
|/
* Merge "Fix tools_r10 build." into tools_r10David 'Digit' Turner2011-04-078-3559/+0
|\
| * Fix tools_r10 build.David 'Digit' Turner2011-04-078-3559/+0
|/
* Merge "This is now tools r11." into tools_r10Xavier Ducrohet2011-03-181-1/+1
|\
| * This is now tools r11.Xavier Ducrohet2011-03-181-1/+1
|/
* Merge "Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not ...Xavier Ducrohet2011-03-184-0/+35
|\
| * Merge ec970d641caedee9656ef8fcc7cdd60e6812b75d into tools_r10. do not merge.David 'Digit' Turner2011-03-184-0/+35
|/
* Merge "Merge 2daa3514 from master into tools_r10" into tools_r10Xavier Ducrohet2011-03-101-8/+9
|\
| * Merge 2daa3514 from master into tools_r10Raphael Moll2011-03-091-8/+9
|/
* Merge "Merge ee5c6227 from master. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-03-095-8/+10
|\
| * Merge ee5c6227 from master. DO NOT MERGE.Xavier Ducrohet2011-03-095-8/+10
|/
* Merge "ADT 10.0.1 - DO NOT MERGE." into tools_r10Xavier Ducrohet2011-03-0915-31/+25
|\
| * ADT 10.0.1 - DO NOT MERGE.Xavier Ducrohet2011-03-0815-31/+25
|/
* Merge "Merge 2c8b999e into tools_r10. do not merge." into tools_r10Xavier Ducrohet2011-02-161-96/+111
|\
| * Merge 2c8b999e into tools_r10. do not merge.Bertil Lynner2011-02-161-96/+111
|/
* Merge "Merge 11e72f25 into tools_r10. DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-161-10/+10
|\
| * Merge 11e72f25 into tools_r10. DO NOT MERGE.Mike Lockwood2011-02-161-10/+10
|/
* Merge "Android.bat: Properly copy common.jar to the temp folder." into tools_r10Xavier Ducrohet2011-02-111-0/+1
|\
| * Android.bat: Properly copy common.jar to the temp folder.Raphael Moll2011-02-111-0/+1
|/
* Merge "SDK Manager: Update All doesn't pick highest revisions" into tools_r10Xavier Ducrohet2011-02-103-5/+117
|\
| * SDK Manager: Update All doesn't pick highest revisionsRaphael Moll2011-02-103-5/+117
|/
* Merge "Integrate 3f18a506 into tools_r10" into tools_r10Xavier Ducrohet2011-02-102-13/+30
|\
| * Integrate 3f18a506 into tools_r10Xavier Ducrohet2011-02-102-13/+30
|/
* Merge "SDK Manager: 'update all' was not selecting addon updates." into tools...Xavier Ducrohet2011-02-102-0/+3
|\
| * SDK Manager: 'update all' was not selecting addon updates.Raphael Moll2011-02-102-0/+3
|/
* Merge "Integrate 32c960c6 in tools_R10 -- DO NOT MERGE." into tools_r10Xavier Ducrohet2011-02-093-3/+13
|\
| * Integrate 32c960c6 in tools_R10 -- DO NOT MERGE.Xavier Ducrohet2011-02-093-3/+13
|/
* Merge "Fix included-in overlay mask" into tools_r10Xavier Ducrohet2011-02-092-1/+33
|\
| * Fix included-in overlay maskTor Norbye2011-02-092-1/+33
|/
* Merge "SDK Manager: fix install order of packages."Raphael Moll2011-02-092-5/+56
|\
| * SDK Manager: fix install order of packages.Raphael Moll2011-02-082-5/+56
|/
* Merge "Add unit test to SdkUiLib UpdaterData.installArchives."Raphael Moll2011-02-0811-39/+337
|\
| * Add unit test to SdkUiLib UpdaterData.installArchives.Raphael Moll2011-02-0811-39/+337
* | Merge "Fix Extract as Include"Xavier Ducrohet2011-02-081-0/+9
|\ \ | |/ |/|
| * Fix Extract as IncludeTor Norbye2011-02-081-0/+9
* | Merge "Make layout editor margins compress when necessary"Tor Norbye2011-02-086-81/+64
|\ \
| * | Make layout editor margins compress when necessaryTor Norbye2011-02-086-81/+64
| |/
* | Merge "Ant tasks and dependency clean up."Xavier Ducrohet2011-02-085-15/+26
|\ \ | |/ |/|
| * Ant tasks and dependency clean up.Xavier Ducrohet2011-02-085-15/+26
* | Merge "Layout Actions bar fixes"Tor Norbye2011-02-087-26/+64
|\ \
| * | Layout Actions bar fixesTor Norbye2011-02-087-26/+64
| |/
* | Merge "Leave scrollbars visible"Tor Norbye2011-02-081-2/+0
|\ \
| * | Leave scrollbars visibleTor Norbye2011-02-081-2/+0
|/ /
* | Merge "Make zoom level persistent"Tor Norbye2011-02-084-33/+72
|\ \
| * | Make zoom level persistentTor Norbye2011-02-084-33/+72
* | | Merge "ADT builder clean up."Xavier Ducrohet2011-02-087-70/+65
|\ \ \ | |_|/ |/| |
| * | ADT builder clean up.Xavier Ducrohet2011-02-087-70/+65
|/ /