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/GreenDroid-GoogleAPIs
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
13 years ago
..
src/greendroid/app (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
.classpath (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
.project (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
AndroidManifest.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago
default.properties (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 13 years ago