Merge workaround for bug 2012. Ignore workaround for bug 2584 as no longer appears applicable. RCL_3
authorPat Downey <patd@symbian.org>
Tue, 13 Jul 2010 11:29:56 +0100
branchRCL_3
changeset 42 6b0a8425dd42
parent 38 c52421ed5f07 (current diff)
parent 35 b02ebb4a4e15 (diff)
child 43 07b3ec0df257
Merge workaround for bug 2012. Ignore workaround for bug 2584 as no longer appears applicable.
uifw/AvKon/src/aknlists.cpp
--- 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
--- 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