← Back to branch summary

~dpniel/ubuntu-calendar-app/ScrollView2

~dpniel/ubuntu-calendar-app/ScrollView2

« back to all changes in this revision

Viewing changes to AgendaView.qml

Committer: Gary.Wzl
Date: 2015-10-28 02:12:50 UTC
mfrom: (706.2.2 show-week-number)
mto: (725.1.1 ubuntu-calendar-app)
mto: This revision was merged to the branch mainline in revision 726.
Revision ID: gary.wang@canonical.com-20151028021250-uqb4t5jgo3u7rumg

Merge into trunk to resolve conflict

files added:
OfflineStorage.js

Settings.qml

files modified:
AgendaView.qml

AllDayEventComponent.qml

DayView.qml

EventActions.qml

MonthComponent.qml

MonthView.qml

WeekView.qml

YearView.qml

YearViewDelegate.qml

calendar.qml

po/com.ubuntu.calendar.pot

Show diffs side-by-side

added added

removed removed

60

60

commonHeaderActions.newEventAction,

61

61

commonHeaderActions.showCalendarAction,

62

62

commonHeaderActions.reloadAction,

63

commonHeaderActions.syncCalendarAction

63

commonHeaderActions.syncCalendarAction,

64

commonHeaderActions.settingsAction

64

65

]

65

66

66

67

EventListModel {

Older »