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
Tim Su 33ae2cad02 Merge remote branch 'origin/master' into dev
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkNote.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMTaskContainer.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
	astrid/src/com/todoroo/astrid/service/StartupService.java
16 years ago
..
.settings Fixed some issues, added undelete, etc. 16 years ago
api-src/com/todoroo/astrid/api Merge remote branch 'origin/master' into dev 16 years ago
common-src/com/todoroo/andlib Merge remote branch 'origin/master' into dev 16 years ago
gen Updated modes, re-added empty gitignore files for gen 16 years ago
libs Fixed up locale plugin to check for add on: 16 years ago
plugin-src/com/todoroo/astrid Merge remote branch 'origin/master' into dev 16 years ago
res Merge remote branch 'origin/master' into dev 16 years ago
src/com/todoroo/astrid Merge remote branch 'origin/master' into dev 16 years ago
src-legacy/com/timsu/astrid Fix for producteev control set crashing if data was null, got rid of all warnings in the project 16 years ago
.classpath updated pp icon, removed caching of pp check, bumped expiry 16 years ago
.project Fix CRLF for dev 16 years ago
AndroidManifest.xml Merge remote branch 'origin/master' into dev 16 years ago
astrid.launch AST-246 - caching task details 16 years ago
default.properties Restored Android version to 2.2. 16 years ago
translation-notes More progress in the effort of getting notifications working. 16 years ago