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 c537ea95c8 Merge branch 'master' into 100616-replace-controllers
Conflicts:
	astrid/AndroidManifest.xml
15 years ago
..
.settings Moved projects around. 15 years ago
api-src/com/todoroo/astrid/api Moved projects around. 15 years ago
common-src/com/todoroo/andlib Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. 15 years ago
gen Moved projects around. 15 years ago
lib Moved projects around. 15 years ago
plugin-src/com/todoroo/astrid Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. 15 years ago
res Merge branch 'master' into 100616-replace-controllers 15 years ago
src/com/todoroo/astrid Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. 15 years ago
src-legacy/com Merge branch 'master' into 100616-replace-controllers 15 years ago
.classpath Fix classpath for Astrid & tests, fixed NPE in TasksXmlExporter. 15 years ago
.project Moved projects around. 15 years ago
AndroidManifest.xml Merge branch 'master' into 100616-replace-controllers 15 years ago
default.properties Merge from lp:~alexander-egger-gmail/astrid/ignore-rtm-archived-lists, including update to Android SDK level 7 15 years ago