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/src/com/todoroo/astrid
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
..
backup Added awesome merged translations files. Also fixed the tests to get them to work 16 years ago
dao No more hooks on task dao save, it was confusing and didn't do anything. Also fix for AST-267 - task open from pure calendar 16 years ago
legacy/data Removed some more warnings 16 years ago
model No more hooks on task dao save, it was confusing and didn't do anything. Also fix for AST-267 - task open from pure calendar 16 years ago
reminders No more hooks on task dao save, it was confusing and didn't do anything. Also fix for AST-267 - task open from pure calendar 16 years ago
repeats No more hooks on task dao save, it was confusing and didn't do anything. Also fix for AST-267 - task open from pure calendar 16 years ago
service Added awesome merged translations files. Also fixed the tests to get them to work 16 years ago
test Imported translations into xml's, fixed up format string bugs, and updated spanish translation from launchpad 16 years ago
upgrade Removed some more warnings 16 years ago
ActivityTests.java New tests project, + legacy data structures for testing importing. 16 years ago
AllTests.java New tests project, + legacy data structures for testing importing. 16 years ago