# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1283439806 -3600
# Node ID e36178c55292c2a75d8660c51e2ab4540316cb68
# Parent  8d540f55e4913b659111b52efdd94c307aaa9a01# Parent  36cc450aad1253fc025fc0744b380720f137195d
Merge RCL_3 fixes with reverted delivery

diff -r 8d540f55e491 -r e36178c55292 linklayercontrol/networkinterfacemgr/group/BLD.INF
--- a/linklayercontrol/networkinterfacemgr/group/BLD.INF	Wed Sep 01 12:33:58 2010 +0100
+++ b/linklayercontrol/networkinterfacemgr/group/BLD.INF	Thu Sep 02 16:03:26 2010 +0100
@@ -94,6 +94,9 @@
 ../inc/cfbearers.h 							SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(networking/cfbearers.h)
 #endif // SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 
+// Bug 3108, required to build sf_refhw image
+NetCfgExtnBase.iby              /epoc32/rom/include/NetCfgExtnBase.iby
+
 PRJ_MMPFILES
 
 NIFMAN.MMP        
diff -r 8d540f55e491 -r e36178c55292 networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp
--- a/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Wed Sep 01 12:33:58 2010 +0100
+++ b/networkingtestandutils/networkingintegrationtest/Group/IntegrationTestUtils.mmp	Thu Sep 02 16:03:26 2010 +0100
@@ -34,7 +34,9 @@
 OS_LAYER_SYSTEMINCLUDE_SYMBIAN
 
 LIBRARY     	euser.lib efsrv.lib 
-LIBRARY		cinidata.lib
+// darios: cinidata is deprecated, see bug #1894
+//LIBRARY		cinidata.lib
+LIBRARY		IniParser.lib
 
 epocheapsize  1000 6000000
 CAPABILITY All -Tcb
diff -r 8d540f55e491 -r e36178c55292 networkingtestandutils/networkingintegrationtest/inc/TestStep.h
--- a/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Wed Sep 01 12:33:58 2010 +0100
+++ b/networkingtestandutils/networkingintegrationtest/inc/TestStep.h	Thu Sep 02 16:03:26 2010 +0100
@@ -26,7 +26,9 @@
 #if (!defined __TESTSTEP_H__)
 #define __TESTSTEP_H__
 
-#include "cinidata.h"
+// darios: cinidata is deprecated, see bug #1894
+//#include "cinidata.h"
+#include <iniparser.h>
 #include "networking/log.h"
 
 class CTestSuite;