# HG changeset patch # User Pat Downey # Date 1277309557 -3600 # Node ID 7b2a55595809deca55bfea7898ca253abade7121 # Parent 360d55486d7fa729c4bee978e77ce5a19579169b# Parent 1850873ab5e91804daaabc5062bf23165835ad3f Merge docml files again. diff -r 360d55486d7f -r 7b2a55595809 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml diff -r 360d55486d7f -r 7b2a55595809 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml diff -r 360d55486d7f -r 7b2a55595809 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml diff -r 360d55486d7f -r 7b2a55595809 clock/clockui/clockviews/data/xml/clockmainview.docml diff -r 360d55486d7f -r 7b2a55595809 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 Wed Jun 23 17:12:37 2010 +0100 @@ -0,0 +1,78 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 360d55486d7f -r 7b2a55595809 notes/data/xml/notescollectionsview.docml diff -r 360d55486d7f -r 7b2a55595809 notes/data/xml/notesfavoriteview.docml diff -r 360d55486d7f -r 7b2a55595809 notes/data/xml/notesmainview.docml diff -r 360d55486d7f -r 7b2a55595809 notes/data/xml/notesnoteview.docml diff -r 360d55486d7f -r 7b2a55595809 notes/data/xml/notestodoview.docml diff -r 360d55486d7f -r 7b2a55595809 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml