# HG changeset patch # User Pat Downey # Date 1274185009 -3600 # Node ID c690c592b38137a1c0ec95b3740f31567cf5bfb0 # Parent a949c2543c150849615484c2e0b3a15408604fcc# Parent f6320731c6bb34e3c53408dd82dba0ef00ef9082 Merge docml changeset with recent Nokia delivery. diff -r a949c2543c15 -r c690c592b381 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_calendar_unlocked.docml diff -r a949c2543c15 -r c690c592b381 alarmui/alarmalertwidget/alarmalertplugin/data/xml/alarmalert_todo_unlocked.docml diff -r a949c2543c15 -r c690c592b381 clock/clockui/clocksettingsview/data/xml/clocksettingsview.docml diff -r a949c2543c15 -r c690c592b381 clock/clockui/clockviews/data/xml/clockmainview.docml diff -r a949c2543c15 -r c690c592b381 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 May 18 13:16:49 2010 +0100 @@ -0,0 +1,78 @@ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r a949c2543c15 -r c690c592b381 notes/data/xml/notescollectionsview.docml diff -r a949c2543c15 -r c690c592b381 notes/data/xml/notesfavoriteview.docml diff -r a949c2543c15 -r c690c592b381 notes/data/xml/notesmainview.docml diff -r a949c2543c15 -r c690c592b381 notes/data/xml/notesnoteview.docml diff -r a949c2543c15 -r c690c592b381 notes/data/xml/notestodoview.docml diff -r a949c2543c15 -r c690c592b381 notes/notesui/noteseditor/data/xml/notesnoteeditor.docml