# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1287749068 -3600
# Node ID 93a7f5bb8928c5ded7d37d86493a2322e350ad8f
# Parent  4399c14e1ad0c59790eab44793d0882299505eee# Parent  9638716ad12eb69e8a294858345cf6df8052fc38
Remerge fix for Bug 2179

diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/Engine/HttpHandler.cpp
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/data/ConnTest_reg.rss
--- a/nettools/conntest/data/ConnTest_reg.rss	Thu Sep 02 15:28:22 2010 +0100
+++ b/nettools/conntest/data/ConnTest_reg.rss	Fri Oct 22 13:04:28 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,7 +16,7 @@
 */
 
 #include <appinfo.rh>
-#include <conntest.rsg>
+#include <ConnTest.rsg>
 
 UID2 KUidAppRegistrationResourceFile
 UID3 0x101F6D2B // application UID
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/group/ConnTest.mmp
--- a/nettools/conntest/group/ConnTest.mmp	Thu Sep 02 15:28:22 2010 +0100
+++ b/nettools/conntest/group/ConnTest.mmp	Fri Oct 22 13:04:28 2010 +0100
@@ -76,7 +76,7 @@
 LIBRARY           apparc.lib
 LIBRARY           apgrfx.lib
 LIBRARY           avkon.lib
-LIBRARY           aknskins.lib
+LIBRARY           AknSkins.lib
 LIBRARY           aknnotify.lib
 LIBRARY           bafl.lib 
 LIBRARY           commdb.lib
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/inc/HttpHandler.h
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/inc/SocketsEngine.h
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/inc/SocketsRead.h
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/inc/SocketsWrite.h
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/inc/Utils.h
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/src/ConnTestAppUi.cpp
--- a/nettools/conntest/src/ConnTestAppUi.cpp	Thu Sep 02 15:28:22 2010 +0100
+++ b/nettools/conntest/src/ConnTestAppUi.cpp	Fri Oct 22 13:04:28 2010 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -26,7 +26,7 @@
 
 #include "ConnTestAppUi.h"
 #include "ConnTestView.h"
-#include <conntest.rsg>
+#include <ConnTest.rsg>
 #include "conntest.hrh"
 #include "SettingData.h"
 #include "ipdumpengine.h"
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/src/ConnTestView.cpp
--- a/nettools/conntest/src/ConnTestView.cpp	Thu Sep 02 15:28:22 2010 +0100
+++ b/nettools/conntest/src/ConnTestView.cpp	Fri Oct 22 13:04:28 2010 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -22,7 +22,7 @@
 #include <avkon.hrh>
 #include <AknGlobalNote.h>
 
-#include <conntest.rsg>
+#include <ConnTest.rsg>
 #include "ConnTestView.h"
 #include "ConnTestContainer.h"
 #include "CustomPrefsItemList.h"
diff -r 9638716ad12e -r 93a7f5bb8928 nettools/conntest/src/Utils.cpp
--- a/nettools/conntest/src/Utils.cpp	Thu Sep 02 15:28:22 2010 +0100
+++ b/nettools/conntest/src/Utils.cpp	Fri Oct 22 13:04:28 2010 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). 
+ * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <commdb.h>
 #include <aknlistquerydialog.h>
-#include <conntest.rsg>
+#include <ConnTest.rsg>
 
 #include <aknselectionlist.h>
 #include <aknPopup.h>