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/common-src/com/todoroo/andlib/data
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
..
AbstractDatabase.java Now we detect if an anomalous database state has occurred and try to restore tasks. Also now we sort backup files by last modified date 16 years ago
AbstractModel.java Merge remote branch 'origin/master' into dev 16 years ago
GenericDao.java Merge remote branch 'origin/master' into dev 16 years ago
Property.java Made lots of changes in an attempt to clean stuff up 16 years ago
Table.java Made lots of changes in an attempt to clean stuff up 16 years ago
TodorooCursor.java Moved projects around. 16 years ago