# HG changeset patch # User Pat Downey # Date 1279016996 -3600 # Node ID 6b0a8425dd426816710f94e2f4bd191cfe65f3bc # Parent c52421ed5f0746738cd7106653ef907bc5c2acf5# Parent b02ebb4a4e152fc0900f4cfbc00871531a471185 Merge workaround for bug 2012. Ignore workaround for bug 2584 as no longer appears applicable. diff -r c52421ed5f07 -r 6b0a8425dd42 commonuisupport/uikon/group/BLD.INF --- a/commonuisupport/uikon/group/BLD.INF Mon Jun 21 15:57:43 2010 +0300 +++ b/commonuisupport/uikon/group/BLD.INF Tue Jul 13 11:29:56 2010 +0100 @@ -92,12 +92,12 @@ ../EABI/EIKINITU.DEF /epoc32/include/def/eabi/eikinitu.def // from ..\docs -../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc -../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc -../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc -../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc -../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc -../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc +//../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc +//../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc +//../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc +//../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc +//../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc +//../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc PRJ_MMPFILES diff -r c52421ed5f07 -r 6b0a8425dd42 lafagnosticuifoundation/bmpanimation/group/BLD.INF --- a/lafagnosticuifoundation/bmpanimation/group/BLD.INF Mon Jun 21 15:57:43 2010 +0300 +++ b/lafagnosticuifoundation/bmpanimation/group/BLD.INF Tue Jul 13 11:29:56 2010 +0100 @@ -30,7 +30,7 @@ ../inc/bmpansrv.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpansrv.h) ../inc/bmpanconsts.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpanconsts.h) -../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc +//../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc ../group/BmpAnim.iby /epoc32/rom/include/bmpanim.iby PRJ_MMPFILES diff -r c52421ed5f07 -r 6b0a8425dd42 uifw/AvKon/src/aknlists.cpp