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
Arne Jans 27010eb6cd Merge branch 'master' into unifiedtabletphone-ui
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	astrid/src/com/todoroo/astrid/welcome/SplashScreenLauncher.java
	astrid/src/com/todoroo/astrid/welcome/WelcomeGraphic.java
13 years ago
..
timsu/astrid Fixed threading in C2DM registration that could cause an ANR on first sync: 13 years ago
todoroo/astrid Merge branch 'master' into unifiedtabletphone-ui 13 years ago