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/res/xml
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
..
filter_list_searchable.xml Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. 15 years ago
preferences.xml Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
preferences_reminders.xml Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 15 years ago
sync_preferences.xml Moved projects around. 15 years ago
widget_provider_info.xml Moved projects around. 15 years ago