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

	astrid/res/layout/task_list_activity.xml
14 years ago
..
anim Fix CRLF for some Greendroid-files 14 years ago
drawable Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
drawable-hdpi Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
drawable-mdpi Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
layout wallpaper-background experiment 14 years ago
values wallpaper-background experiment 14 years ago
values-fr Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago
values-land Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 14 years ago