Merge branch 'task-widget' of ssh://git.dmfs.org:23023/android-tasks/tasks into task-widget
Conflicts: res/xml-v11/task_widget_info.xml src/org/dmfs/tasks/homescreen/TaskListWidgetProvider.java src/org/dmfs/tasks/homescreen/TaskListWidgetUpdaterService.java src/org/dmfs/tasks/homescreen/utils/TaskListWidgetItem.java src/org/dmfs/tasks/homescreen/utils/WidgetCusorListGenerator.java src/org/dmfs/tasks/utils/DueDateFormatter.java
Loading
Please register or sign in to comment