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
Tim Su fc043a1d0d wallpaper-background experiment
Conflicts:

	astrid/res/layout/task_list_activity.xml
13 years ago
..
res wallpaper-background experiment 13 years ago
src/greendroid Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
.classpath Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
.project Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
AndroidManifest.xml Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
default.properties wallpaper-background experiment 13 years ago