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/res/layout
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
14 years ago
..
about.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
headed_text_item_view.xml
image.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
image_item_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
info.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
quick_action.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
segmented_controls.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
text.xml
web_view.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago