Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Improve the choice of default configuration | Tor Norbye | 2011-05-18 | 1 | -3/+48 | |
|/ / / | ||||||
* | | | Merge "Fix bug in editor open utility" | Tor Norbye | 2011-05-17 | 2 | -47/+55 | |
|\ \ \ | ||||||
| * | | | Fix bug in editor open utility | Tor Norbye | 2011-05-17 | 2 | -47/+55 | |
| | |/ | |/| | ||||||
* | | | merge from tools-adt_r11 | The Android Open Source Project | 2011-05-17 | 0 | -0/+0 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | Merge "Merge a109773a from master. do not merge." into tools-adt_r11 | Xavier Ducrohet | 2011-05-17 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge a109773a from master. do not merge. | Xavier Ducrohet | 2011-05-17 | 1 | -1/+1 | |
| |/ | ||||||
* | | Merge "Fragment Rendering Support" | Tor Norbye | 2011-05-17 | 8 | -27/+382 | |
|\ \ | ||||||
| * | | Fragment Rendering Support | Tor Norbye | 2011-05-17 | 8 | -27/+382 | |
|/ / | ||||||
* | | Merge "Basic fragment support" | Tor Norbye | 2011-05-17 | 13 | -19/+329 | |
|\ \ | ||||||
| * | | Basic fragment support | Tor Norbye | 2011-05-16 | 13 | -19/+329 | |
* | | | Merge "Update layoutlib api level to 6." | Xavier Ducrohet | 2011-05-17 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Update layoutlib api level to 6. | Xavier Ducrohet | 2011-05-16 | 1 | -1/+1 | |
* | | | | merge from tools-adt_r11 | The Android Open Source Project | 2011-05-17 | 0 | -0/+0 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge "Merge 580ecb7a from master. do not merge." into tools-adt_r11 | Xavier Ducrohet | 2011-05-17 | 7 | -29/+231 | |
| |\ \ \ | ||||||
| | * | | | Merge 580ecb7a from master. do not merge. | Xavier Ducrohet | 2011-05-17 | 7 | -29/+231 | |
| |/ / / | ||||||
* | | | | merge from tools-adt_r11 | The Android Open Source Project | 2011-05-17 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge "Merge 'Remove "Android Tools > Convert to Android Project"' into tools... | Raphael Moll | 2011-05-17 | 2 | -189/+0 | |
| |\ \ \ | ||||||
| | * | | | Merge 'Remove "Android Tools > Convert to Android Project"' into tools-adt_r11 | Raphael Moll | 2011-05-16 | 2 | -189/+0 | |
| |/ / / | ||||||
* | | | | Merge "Plug in about/settings for SDK Manager 2." | Raphael Moll | 2011-05-17 | 15 | -99/+328 | |
|\ \ \ \ | ||||||
| * | | | | Plug in about/settings for SDK Manager 2. | Raphael Moll | 2011-05-13 | 15 | -99/+328 | |
* | | | | | Merge "Adjust "Compiler compliance" error to be more useful." | Raphael Moll | 2011-05-17 | 4 | -20/+31 | |
|\ \ \ \ \ | ||||||
| * | | | | | Adjust "Compiler compliance" error to be more useful. | Raphael Moll | 2011-05-12 | 4 | -20/+31 | |
* | | | | | | Merge "Fix space-in-dir issue with Proguard for the ant case." | Raphael Moll | 2011-05-17 | 1 | -12/+26 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fix space-in-dir issue with Proguard for the ant case. | Raphael Moll | 2011-05-12 | 1 | -12/+26 | |
* | | | | | | | Merge "Fix space-in-path proguard for ADT Export." | Raphael Moll | 2011-05-17 | 1 | -43/+110 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix space-in-path proguard for ADT Export. | Raphael Moll | 2011-05-12 | 1 | -43/+110 | |
* | | | | | | | Merge "Fix proguard wrapper to capture all args." | Raphael Moll | 2011-05-17 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix proguard wrapper to capture all args. | Raphael Moll | 2011-05-12 | 1 | -2/+2 | |
| |/ / / / / | ||||||
* | | | | | | Merge "Binary XML editor" | Tor Norbye | 2011-05-17 | 1 | -3/+13 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Binary XML editor | Haris Peco | 2011-05-17 | 1 | -3/+13 | |
|/ / / / / | ||||||
* | | | | | Merge "Add baseline/margins to ViewInfo." | Xavier Ducrohet | 2011-05-16 | 7 | -29/+231 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add baseline/margins to ViewInfo. | Xavier Ducrohet | 2011-05-16 | 7 | -29/+231 | |
* | | | | | | Merge "Form editor up/down move accross siblings." | Raphael Moll | 2011-05-16 | 2 | -18/+82 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Form editor up/down move accross siblings. | Raphael Moll | 2011-05-16 | 2 | -18/+82 | |
* | | | | | | | Merge "Fix Up/Down buttons in UiTreeBlock form editor." | Raphael Moll | 2011-05-16 | 3 | -125/+293 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Fix Up/Down buttons in UiTreeBlock form editor. | Raphael Moll | 2011-05-16 | 3 | -125/+293 | |
* | | | | | | | Merge "Remove "Android Tools > Convert to Android Project"" | Raphael Moll | 2011-05-16 | 2 | -189/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Remove "Android Tools > Convert to Android Project" | Raphael Moll | 2011-05-16 | 2 | -189/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge "Move Grid{Data,Layout}Builder to SDK UI Lib" | Raphael Moll | 2011-05-13 | 3 | -7/+10 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Move Grid{Data,Layout}Builder to SDK UI Lib | Raphael Moll | 2011-05-13 | 3 | -7/+10 | |
* | | | | | | Merge "Refactor some common Dialog methods in a base class." | Raphael Moll | 2011-05-13 | 4 | -163/+261 | |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | ||||||
| * | | | | Refactor some common Dialog methods in a base class. | Raphael Moll | 2011-05-13 | 4 | -163/+261 | |
| |/ / / | ||||||
* | | | | Merge "Make Go To Declaration work for <fragment> names." | Tor Norbye | 2011-05-13 | 8 | -4/+101 | |
|\ \ \ \ | ||||||
| * | | | | Make Go To Declaration work for <fragment> names. | Tor Norbye | 2011-05-13 | 8 | -4/+101 | |
|/ / / / | ||||||
* | | | | Merge "Custom View handling improvements" | Tor Norbye | 2011-05-13 | 9 | -12/+67 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Custom View handling improvements | Tor Norbye | 2011-05-13 | 9 | -12/+67 | |
| |/ / | ||||||
* | | | Merge "Escape Strings extracted with the Extract String refactoring" | Tor Norbye | 2011-05-12 | 1 | -0/+31 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Escape Strings extracted with the Extract String refactoring | Tor Norbye | 2011-05-12 | 1 | -0/+31 | |
|/ / | ||||||
* | | Merge "Use enum for converting TouchPressType values" | Bill Napier | 2011-05-11 | 8 | -72/+97 | |
|\ \ | ||||||
| * | | Use enum for converting TouchPressType values | Terence Haddock | 2011-04-15 | 8 | -72/+97 |