# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572103 0
# Node ID 6a42f6e7343665ae7e1de25d0e1cbb4d2e52bafa
# Parent  b78b45177ad9fd322d18a598233b2de8e4e667de# Parent  cc5042a680fb7eb5172cb184db5fdd7ece91af5b
Automatic merge from PDK_3.0.h

diff -r b78b45177ad9 -r 6a42f6e73436 emulatorlan/group/bld.inf
--- a/emulatorlan/group/bld.inf	Mon Mar 08 21:43:01 2010 +0000
+++ b/emulatorlan/group/bld.inf	Sun Mar 14 13:08:23 2010 +0000
@@ -21,7 +21,7 @@
 PRJ_EXPORTS
 ../data/configchange.pl             /epoc32/tools/configchange.pl
 ../data/EnableLanConnection.cmd     /epoc32/tools/EnableLanConnection.cmd
-../data/ethernetced.xml             /epoc32/winscw/c/ethernetced.xml
+../data/ethernetced.xml             /epoc32/winscw/c/ethernetced_conntools.xml
 ../data/s60_32_default_snaps.xml    /epoc32/winscw/c/s60_32_default_snaps.xml
 
 PRJ_MMPFILES
diff -r b78b45177ad9 -r 6a42f6e73436 nettools/conntest/probe/inc/prt.h
--- a/nettools/conntest/probe/inc/prt.h	Mon Mar 08 21:43:01 2010 +0000
+++ b/nettools/conntest/probe/inc/prt.h	Sun Mar 14 13:08:23 2010 +0000
@@ -19,6 +19,7 @@
 #define __PROBE_PRT_H
 
 #include <e32std.h>
+#include <f32file.h>
 #include <es_sock.h>
 #include <nifman.h>
 #include <in_bind.h>