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 6f6956dcd8 Merge branch 'master' into 4.0
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/project.properties
	astrid/res/drawable-hdpi/widget_frame.png
	astrid/res/drawable-land-hdpi/widget_frame.png
	astrid/res/drawable-land/widget_frame.png
	astrid/res/drawable/widget_frame.png
	astrid/res/layout/task_list_activity.xml
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	greendroid/GreenDroid/.classpath
14 years ago
..
res removed 3-column-layout with taskedit, now 2column. Also handling of the Astrid-logo-button as up-button. 14 years ago
src/greendroid Fixed ambiguity in greendroid with getActionBar from Honeycomb-Activity 14 years ago
.classpath Merge branch 'master' into 4.0 14 years ago
.project Merge commit '7257a793e6843c3576fbbe24e947775b1a47fa65' as 'greendroid' 15 years ago
AndroidManifest.xml (greendroid) Merge commit 'e60715acccdc494d825529b4d217f52298c4c83e' 15 years ago
build.xml Migrated ant scripts to Android SDK v15 14 years ago
proguard.cfg Migrated ant scripts to Android SDK v15 14 years ago
project.properties fix project-setups... again.... 14 years ago