# HG changeset patch # User Pat Downey # Date 1275409421 -3600 # Node ID 1850873ab5e91804daaabc5062bf23165835ad3f # Parent ea672fcb0ea0b804cdbac5a1da3e1b2a33cde93f# Parent c690c592b38137a1c0ec95b3740f31567cf5bfb0 Re-merge docml files. diff -r ea672fcb0ea0 -r 1850873ab5e9 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 clock/clockui/clockviews/data/xml/clockmainview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 clock/clockui/clockviews/data/xml/worldclockview.docml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/clock/clockui/clockviews/data/xml/worldclockview.docml Tue Jun 01 17:23:41 2010 +0100 @@ -0,0 +1,78 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/data/xml/notescollectionsview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/data/xml/notesfavoriteview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/data/xml/notesmainview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/data/xml/notesnoteview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/data/xml/notestodoview.docml diff -r ea672fcb0ea0 -r 1850873ab5e9 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml