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/tests
Tim Su da7f87a4e0 Merge branch '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/MilkLoginActivity.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
	astrid/src/com/todoroo/astrid/service/StartupService.java
16 years ago
..
.settings New tests project, + legacy data structures for testing importing. 16 years ago
gen Updated modes, re-added empty gitignore files for gen 16 years ago
res New tests project, + legacy data structures for testing importing. 16 years ago
src/com/todoroo Merge branch 'master' into dev 16 years ago
.classpath Fix classpath for Astrid & tests, fixed NPE in TasksXmlExporter. 16 years ago
.project Moved projects around. 16 years ago
Android.mk New tests project, + legacy data structures for testing importing. 16 years ago
AndroidManifest.xml Worked on migrating tasks table. And unit tests. 16 years ago
build.properties New tests project, + legacy data structures for testing importing. 16 years ago
build.xml New tests project, + legacy data structures for testing importing. 16 years ago
default.properties New tests project, + legacy data structures for testing importing. 16 years ago