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/astrid/plugin-src/com/todoroo/astrid
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
..
actfm Merge branch 'master' into 4.0 14 years ago
alarms More progress on calendar picker 14 years ago
backup Use dismiss Dialog instead of dialog.dismiss() where possible 15 years ago
core Fixed the loginpage and actfmaloginactivity for landscape 14 years ago
gcal Merge branch 'master' into 4.0 14 years ago
gtasks Can now swap custom task list fragments for filters with custom intents 14 years ago
locale Fix Locale plugin to read extras from forwarded bundle instead of straight from the intent 14 years ago
notes Add progress bar for fetching task activity 14 years ago
opencrx New edit page in its entirety 14 years ago
producteev Removed debugging println statements 14 years ago
reminders merged master into unifiedtabletphone-ui 14 years ago
repeats Fixed invisible checkboxes in repeat control set 14 years ago
tags Can now swap custom task list fragments for filters with custom intents 14 years ago
timers Removed debugging println statements 14 years ago