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
Sam Bosley 054b8b4f4f Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists
Conflicts:
	astrid/src/com/todoroo/astrid/activity/AstridActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

Merge upstream/master
14 years ago
..
.settings 2nd alpha version of tablet/phone ui with actionbar-classes and basic callback-structure through activities as proposed in the 'supporting handsets' article on developer.android.com 14 years ago
antlib Bundle our own Proguard jar 14 years ago
assets Moved art to assets folder to get preserved by jjjenkins 14 years ago
common-src/com whitespace 14 years ago
libs Updated Crittercism library 14 years ago
plugin-src/com Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists 14 years ago
res Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists 14 years ago
rmilk-src Refactored Task.REMOTE_ID to be null when unset rather than 0. Also catch SQLiteConsistency exceptions and recover when inserting a task that already has that remote id. 14 years ago
src/com/todoroo/astrid Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists 14 years ago
src-legacy/com/timsu/astrid Cleaned up a bunch of warnings, fixed a few small issues, code and formatting cleanup 14 years ago
.classpath Cleaned up classpath 14 years ago
.project New ui for task edit activity 14 years ago
AndroidManifest.xml Version bump and upgrade message 14 years ago
ant.properties Ant build output folder to antbuild/ 14 years ago
astrid.launch update 14 years ago
build.xml Use debug/release api keys with google maps (for taskrabbit), fixed some task rabbit copy 14 years ago
proguard.cfg Bundle our own Proguard jar 14 years ago
project.properties Task rabbit views 14 years ago
translation-notes More progress in the effort of getting notifications working. 16 years ago