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 05234dde7f Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers
Conflicts:
	astrid/res/xml/preferences.xml
	astrid/res/xml/preferences_reminders.xml
15 years ago
..
.settings been updating task edit. just finished urgency... rest of stuff should be fast 15 years ago
api-src/com/todoroo/astrid/api Made lots of changes in an attempt to clean stuff up 15 years ago
common-src/com/todoroo/andlib Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
gen
lib
plugin-src/com/todoroo/astrid Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
res Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
src/com/todoroo/astrid Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
src-legacy/com Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
.classpath Fix classpath for Astrid & tests, fixed NPE in TasksXmlExporter. 15 years ago
.project
AndroidManifest.xml Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
astrid.launch Fixed various minor usability issues. A lot more smooth now. 15 years ago
default.properties Fixed various minor usability issues. A lot more smooth now. 15 years ago
translation-notes More progress in the effort of getting notifications working. 15 years ago