You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tasks/greendroid/GDCatalog/src/com/cyrilmottier/android/gdcatalog
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
14 years ago
..
widget Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
AboutActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
ActionBarActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
AsyncImageViewListActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
BasicItemActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
CatalogActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
CatalogApplication.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
InfoTabActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
QuickActionActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
SegmentedActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
SimpleAsyncImageViewActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
TabbedActionBarActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
TweakedItemViewActivity.java Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
WebContentActivity.java (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
XmlItemActivity.java Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago