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
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
13 years ago
..
color (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
drawable (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
drawable-hdpi (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
drawable-mdpi (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
layout (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
values (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
values-en (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
values-fr (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago