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/values
Tim Su e1e448c89c (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e'
Conflicts:
	greendroid/GDCatalog/res/values/dimens.xml
	greendroid/GreenDroid/res/values/gd_colors.xml
14 years ago
..
dimens.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
ids.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
strings.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
styles.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 14 years ago
themes.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago