# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1273845880 -10800
# Node ID b45fe1029b5ddb2282b29c81817aab827c09f762
# Parent  fc38b048ab2fb14ab1c921bebef2be582db712a3
Revision: 201019
Kit: 201019

diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/adobereader/help/data/xhtml.zip
Binary file helps_loc2/adobereader/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/adobereader/help/group/bld.inf
--- a/helps_loc2/adobereader/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/appmngr2/help/data/xhtml.zip
Binary file helps_loc2/appmngr2/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/appmngr2/help/group/bld.inf
--- a/helps_loc2/appmngr2/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/audiothemes/help/data/xhtml.zip
Binary file helps_loc2/audiothemes/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/audiothemes/help/group/bld.inf
--- a/helps_loc2/audiothemes/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/blid/help/data/xhtml.zip
Binary file helps_loc2/blid/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/blid/help/group/bld.inf
--- a/helps_loc2/blid/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/browserui/help/data/xhtml.zip
Binary file helps_loc2/browserui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/browserui/help/group/bld.inf
--- a/helps_loc2/browserui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/btui/help/data/xhtml.zip
Binary file helps_loc2/btui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/btui/help/group/bld.inf
--- a/helps_loc2/btui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/calcsoft/help/data/xhtml.zip
Binary file helps_loc2/calcsoft/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/calcsoft/help/group/bld.inf
--- a/helps_loc2/calcsoft/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/calendarui/help/data/xhtml.zip
Binary file helps_loc2/calendarui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/calendarui/help/group/bld.inf
--- a/helps_loc2/calendarui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cameraapp/help/data/xhtml.zip
Binary file helps_loc2/cameraapp/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cameraapp/help/group/bld.inf
--- a/helps_loc2/cameraapp/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cbsui/help/data/xhtml.zip
Binary file helps_loc2/cbsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cbsui/help/group/bld.inf
--- a/helps_loc2/cbsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/certmanui/help/data/xhtml.zip
Binary file helps_loc2/certmanui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/certmanui/help/group/bld.inf
--- a/helps_loc2/certmanui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/clock2/help/data/xhtml.zip
Binary file helps_loc2/clock2/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/clock2/help/group/bld.inf
--- a/helps_loc2/clock2/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/connectionmonitorui/help/data/xhtml.zip
Binary file helps_loc2/connectionmonitorui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/connectionmonitorui/help/group/bld.inf
--- a/helps_loc2/connectionmonitorui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/converter/help/data/xhtml.zip
Binary file helps_loc2/converter/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/converter/help/group/bld.inf
--- a/helps_loc2/converter/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cscapplicationui/help/data/xhtml.zip
Binary file helps_loc2/cscapplicationui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/cscapplicationui/help/group/bld.inf
--- a/helps_loc2/cscapplicationui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/deviceencryption/help/data/xhtml.zip
Binary file helps_loc2/deviceencryption/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/deviceencryption/help/group/bld.inf
--- a/helps_loc2/deviceencryption/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/drmsettingsplugin/help/data/xhtml.zip
Binary file helps_loc2/drmsettingsplugin/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/drmsettingsplugin/help/group/bld.inf
--- a/helps_loc2/drmsettingsplugin/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/emailhelp/help/data/xhtml.zip
Binary file helps_loc2/emailhelp/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/emailhelp/help/group/bld.inf
--- a/helps_loc2/emailhelp/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/equalizer/help/data/xhtml.zip
Binary file helps_loc2/equalizer/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/equalizer/help/group/bld.inf
--- a/helps_loc2/equalizer/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/eventsui/help/data/xhtml.zip
Binary file helps_loc2/eventsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/eventsui/help/group/bld.inf
--- a/helps_loc2/eventsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/fep/help/data/xhtml.zip
Binary file helps_loc2/fep/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/fep/help/group/bld.inf
--- a/helps_loc2/fep/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/filemanager/help/data/xhtml.zip
Binary file helps_loc2/filemanager/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/filemanager/help/group/bld.inf
--- a/helps_loc2/filemanager/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/fmtx/help/data/xhtml.zip
Binary file helps_loc2/fmtx/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/fmtx/help/group/bld.inf
--- a/helps_loc2/fmtx/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/group/bld.inf
--- a/helps_loc2/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-#include <platform_paths.hrh>	
-  
-#include "../adobereader/help/group/bld.inf"
-#include "../appmngr2/help/group/bld.inf"
-#include "../audiothemes/help/group/bld.inf"
-#include "../blid/help/group/bld.inf"
-#include "../btui/help/group/bld.inf"
-#include "../calcsoft/help/group/bld.inf"
-#include "../calendarui/help/group/bld.inf"
-#include "../cameraapp/help/group/bld.inf"
-#include "../cbsui/help/group/bld.inf"
-#include "../certmanui/help/group/bld.inf"
-#include "../clock2/help/group/bld.inf"
-#include "../connectionmonitorui/help/group/bld.inf"
-#include "../converter/help/group/bld.inf"
-#include "../cscapplicationui/help/group/bld.inf"
-#include "../deviceencryption/help/group/bld.inf"
-#include "../drmsettingsplugin/help/group/bld.inf"
-#include "../emailhelp/help/group/bld.inf"
-#include "../equalizer/help/group/bld.inf"
-#include "../eventsui/help/group/bld.inf"
-#include "../fep/help/group/bld.inf"
-#include "../filemanager/help/group/bld.inf"
-#include "../fmtx/help/group/bld.inf"
-#include "../gssettingsuis/help/group/bld.inf"
-#include "../homemedia/help/group/bld.inf"
-#include "../hqtts/help/group/bld.inf"
-#include "../iaupdate/help/group/bld.inf"
-#include "../idlehomescreen/help/group/bld.inf"
-#include "../im/help/group/bld.inf"
-#include "../imageprintui/help/group/bld.inf"
-#include "../imageviewer/help/group/bld.inf"
-#include "../imum/help/group/bld.inf"
-#include "../java/help/group/bld.inf"
-#include "../landmarksui/help/group/bld.inf"
-#include "../locationsysui/help/group/bld.inf"
-#include "../logsui/help/group/bld.inf"
-#include "../matrixmenu/help/group/bld.inf"
-#include "../mce/help/group/bld.inf"
-#include "../mcsplugin/help/group/bld.inf"
-#include "../mmshui/help/group/bld.inf"
-#include "../mmsui/help/group/bld.inf"
-#include "../mobiledictionary/help/group/bld.inf"
-#include "../mpxmusicplayer/help/group/bld.inf"
-#include "../msgmedia/help/group/bld.inf"
-#include "../notepad/help/group/bld.inf"
-#include "../omadmappui/help/group/bld.inf"
-#include "../omadsappui/help/group/bld.inf"
-#include "../omaprovisioning/help/group/bld.inf"
-#include "../operatormenu/help/group/bld.inf"
-#include "../ovisync/help/group/bld.inf"
-#include "../phonebook/help/group/bld.inf"
-#include "../phoneui/help/group/bld.inf"
-#include "../photossuite/help/group/bld.inf"
-#include "../postcard/help/group/bld.inf"
-#include "../presencesettingsui/help/group/bld.inf"
-#include "../profilesapplication/help/group/bld.inf"
-#include "../psln/help/group/bld.inf"
-#include "../pushmtm/help/group/bld.inf"
-#include "../quickoffice/help/group/bld.inf"
-#include "../radio/help/group/bld.inf"
-#include "../saplayer/help/group/bld.inf"
-#include "../satui/help/group/bld.inf"
-#include "../searchui/help/group/bld.inf"
-#include "../secmodui/help/group/bld.inf"
-#include "../smartmessaging/help/group/bld.inf"
-#include "../smsui/help/group/bld.inf"
-#include "../speeddial/help/group/bld.inf"
-#include "../svgtviewerplugin/help/group/bld.inf"
-#include "../switch5/help/group/bld.inf"
-#include "../unieditor/help/group/bld.inf"
-#include "../usbui/help/group/bld.inf"
-#include "../ussd/help/group/bld.inf"
-#include "../vcommand/help/group/bld.inf"
-#include "../vmbx/help/group/bld.inf"
-#include "../voicerec/help/group/bld.inf"
-#include "../vpnclient/help/group/bld.inf"
-#include "../wapisecuritysettingsui/help/group/bld.inf"
-#include "../wlansniffer/help/group/bld.inf"
-#include "../xdmsettingsui/help/group/bld.inf"
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/gssettingsuis/help/data/xhtml.zip
Binary file helps_loc2/gssettingsuis/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/gssettingsuis/help/group/bld.inf
--- a/helps_loc2/gssettingsuis/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/homemedia/help/data/xhtml.zip
Binary file helps_loc2/homemedia/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/homemedia/help/group/bld.inf
--- a/helps_loc2/homemedia/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/hqtts/help/data/xhtml.zip
Binary file helps_loc2/hqtts/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/hqtts/help/group/bld.inf
--- a/helps_loc2/hqtts/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/iaupdate/help/data/xhtml.zip
Binary file helps_loc2/iaupdate/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/iaupdate/help/group/bld.inf
--- a/helps_loc2/iaupdate/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/idlehomescreen/help/data/xhtml.zip
Binary file helps_loc2/idlehomescreen/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/idlehomescreen/help/group/bld.inf
--- a/helps_loc2/idlehomescreen/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/im/help/data/xhtml.zip
Binary file helps_loc2/im/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/im/help/group/bld.inf
--- a/helps_loc2/im/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageeditorapp/help/data/xhtml.zip
Binary file helps_loc2/imageeditorapp/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageeditorapp/help/group/bld.inf
--- a/helps_loc2/imageeditorapp/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageprintui/help/data/xhtml.zip
Binary file helps_loc2/imageprintui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageprintui/help/group/bld.inf
--- a/helps_loc2/imageprintui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageviewer/help/data/xhtml.zip
Binary file helps_loc2/imageviewer/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imageviewer/help/group/bld.inf
--- a/helps_loc2/imageviewer/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imstutils/help/data/xhtml.zip
Binary file helps_loc2/imstutils/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imstutils/help/group/bld.inf
--- a/helps_loc2/imstutils/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imum/help/data/xhtml.zip
Binary file helps_loc2/imum/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/imum/help/group/bld.inf
--- a/helps_loc2/imum/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/intranetbrowsing3/help/data/xhtml.zip
Binary file helps_loc2/intranetbrowsing3/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/intranetbrowsing3/help/group/bld.inf
--- a/helps_loc2/intranetbrowsing3/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/java/help/data/xhtml.zip
Binary file helps_loc2/java/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/java/help/group/bld.inf
--- a/helps_loc2/java/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/landmarksui/help/data/xhtml.zip
Binary file helps_loc2/landmarksui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/landmarksui/help/group/bld.inf
--- a/helps_loc2/landmarksui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/layers.sysdef.xml
--- a/helps_loc2/layers.sysdef.xml	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
-  <!ENTITY layer_real_source_path "ext/os/s60platformrelease/helps_loc2" >
-]>
-
-<SystemDefinition name="helps_loc2" schema="1.4.0">
-  <systemModel>
-    <layer name="os_layer">
-      <module name="helps_loc2">
-        <unit unitID="abs.helps_loc2" mrp="" bldFile="&layer_real_source_path;/group" name="helps_loc2" />
-      </module>
-    </layer>
-  </systemModel>
-</SystemDefinition>
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/locationsysui/help/data/xhtml.zip
Binary file helps_loc2/locationsysui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/locationsysui/help/group/bld.inf
--- a/helps_loc2/locationsysui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/logsui/help/data/xhtml.zip
Binary file helps_loc2/logsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/logsui/help/group/bld.inf
--- a/helps_loc2/logsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/matrixmenu/help/data/xhtml.zip
Binary file helps_loc2/matrixmenu/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/matrixmenu/help/group/bld.inf
--- a/helps_loc2/matrixmenu/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mce/help/data/xhtml.zip
Binary file helps_loc2/mce/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mce/help/group/bld.inf
--- a/helps_loc2/mce/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mcsplugin/help/data/xhtml.zip
Binary file helps_loc2/mcsplugin/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mcsplugin/help/group/bld.inf
--- a/helps_loc2/mcsplugin/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mmshui/help/data/xhtml.zip
Binary file helps_loc2/mmshui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mmshui/help/group/bld.inf
--- a/helps_loc2/mmshui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mmsui/help/data/xhtml.zip
Binary file helps_loc2/mmsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mmsui/help/group/bld.inf
--- a/helps_loc2/mmsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mobiledictionary/help/data/xhtml.zip
Binary file helps_loc2/mobiledictionary/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mobiledictionary/help/group/bld.inf
--- a/helps_loc2/mobiledictionary/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mpxmusicplayer/help/data/xhtml.zip
Binary file helps_loc2/mpxmusicplayer/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/mpxmusicplayer/help/group/bld.inf
--- a/helps_loc2/mpxmusicplayer/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/msgmedia/help/data/xhtml.zip
Binary file helps_loc2/msgmedia/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/msgmedia/help/group/bld.inf
--- a/helps_loc2/msgmedia/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/notepad/help/data/xhtml.zip
Binary file helps_loc2/notepad/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/notepad/help/group/bld.inf
--- a/helps_loc2/notepad/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omadmappui/help/data/xhtml.zip
Binary file helps_loc2/omadmappui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omadmappui/help/group/bld.inf
--- a/helps_loc2/omadmappui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omadsappui/help/data/xhtml.zip
Binary file helps_loc2/omadsappui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omadsappui/help/group/bld.inf
--- a/helps_loc2/omadsappui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omaprovisioning/help/data/xhtml.zip
Binary file helps_loc2/omaprovisioning/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/omaprovisioning/help/group/bld.inf
--- a/helps_loc2/omaprovisioning/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/operatormenu/help/data/xhtml.zip
Binary file helps_loc2/operatormenu/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/operatormenu/help/group/bld.inf
--- a/helps_loc2/operatormenu/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/ovisync/help/data/xhtml.zip
Binary file helps_loc2/ovisync/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/ovisync/help/group/bld.inf
--- a/helps_loc2/ovisync/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/phonebook/help/data/xhtml.zip
Binary file helps_loc2/phonebook/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/phonebook/help/group/bld.inf
--- a/helps_loc2/phonebook/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/phoneui/help/data/xhtml.zip
Binary file helps_loc2/phoneui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/phoneui/help/group/bld.inf
--- a/helps_loc2/phoneui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/photossuite/help/data/xhtml.zip
Binary file helps_loc2/photossuite/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/photossuite/help/group/bld.inf
--- a/helps_loc2/photossuite/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/postcard/help/data/xhtml.zip
Binary file helps_loc2/postcard/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/postcard/help/group/bld.inf
--- a/helps_loc2/postcard/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/presencesettingsui/help/data/xhtml.zip
Binary file helps_loc2/presencesettingsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/presencesettingsui/help/group/bld.inf
--- a/helps_loc2/presencesettingsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/profilesapplication/help/data/xhtml.zip
Binary file helps_loc2/profilesapplication/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/profilesapplication/help/group/bld.inf
--- a/helps_loc2/profilesapplication/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/psln/help/data/xhtml.zip
Binary file helps_loc2/psln/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/psln/help/group/bld.inf
--- a/helps_loc2/psln/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/pushmtm/help/data/xhtml.zip
Binary file helps_loc2/pushmtm/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/pushmtm/help/group/bld.inf
--- a/helps_loc2/pushmtm/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/quickoffice/help/data/xhtml.zip
Binary file helps_loc2/quickoffice/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/quickoffice/help/group/bld.inf
--- a/helps_loc2/quickoffice/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/radio/help/data/xhtml.zip
Binary file helps_loc2/radio/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/radio/help/group/bld.inf
--- a/helps_loc2/radio/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/saplayer/help/data/xhtml.zip
Binary file helps_loc2/saplayer/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/saplayer/help/group/bld.inf
--- a/helps_loc2/saplayer/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/satui/help/data/xhtml.zip
Binary file helps_loc2/satui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/satui/help/group/bld.inf
--- a/helps_loc2/satui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/searchui/help/data/xhtml.zip
Binary file helps_loc2/searchui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/searchui/help/group/bld.inf
--- a/helps_loc2/searchui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/secmodui/help/data/xhtml.zip
Binary file helps_loc2/secmodui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/secmodui/help/group/bld.inf
--- a/helps_loc2/secmodui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/settingwizard6/help/data/xhtml.zip
Binary file helps_loc2/settingwizard6/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/settingwizard6/help/group/bld.inf
--- a/helps_loc2/settingwizard6/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/smartmessaging/help/data/xhtml.zip
Binary file helps_loc2/smartmessaging/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/smartmessaging/help/group/bld.inf
--- a/helps_loc2/smartmessaging/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/smsui/help/data/xhtml.zip
Binary file helps_loc2/smsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/smsui/help/group/bld.inf
--- a/helps_loc2/smsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/source/en_xml.zip
Binary file helps_loc2/source/en_xml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/speeddial/help/data/xhtml.zip
Binary file helps_loc2/speeddial/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/speeddial/help/group/bld.inf
--- a/helps_loc2/speeddial/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/svgtviewerplugin/help/data/xhtml.zip
Binary file helps_loc2/svgtviewerplugin/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/svgtviewerplugin/help/group/bld.inf
--- a/helps_loc2/svgtviewerplugin/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/switch5/help/data/xhtml.zip
Binary file helps_loc2/switch5/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/switch5/help/group/bld.inf
--- a/helps_loc2/switch5/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/sysdef_1_4_0.dtd
--- a/helps_loc2/sysdef_1_4_0.dtd	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/unieditor/help/data/xhtml.zip
Binary file helps_loc2/unieditor/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/unieditor/help/group/bld.inf
--- a/helps_loc2/unieditor/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/usbui/help/data/xhtml.zip
Binary file helps_loc2/usbui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/usbui/help/group/bld.inf
--- a/helps_loc2/usbui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/ussd/help/data/xhtml.zip
Binary file helps_loc2/ussd/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/ussd/help/group/bld.inf
--- a/helps_loc2/ussd/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vcommand/help/data/xhtml.zip
Binary file helps_loc2/vcommand/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vcommand/help/group/bld.inf
--- a/helps_loc2/vcommand/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vmbx/help/data/xhtml.zip
Binary file helps_loc2/vmbx/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vmbx/help/group/bld.inf
--- a/helps_loc2/vmbx/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/voicerec/help/data/xhtml.zip
Binary file helps_loc2/voicerec/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/voicerec/help/group/bld.inf
--- a/helps_loc2/voicerec/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vpnclient/help/data/xhtml.zip
Binary file helps_loc2/vpnclient/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/vpnclient/help/group/bld.inf
--- a/helps_loc2/vpnclient/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/wapisecuritysettingsui/help/data/xhtml.zip
Binary file helps_loc2/wapisecuritysettingsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/wapisecuritysettingsui/help/group/bld.inf
--- a/helps_loc2/wapisecuritysettingsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/wlansniffer/help/data/xhtml.zip
Binary file helps_loc2/wlansniffer/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/wlansniffer/help/group/bld.inf
--- a/helps_loc2/wlansniffer/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/xdmsettingsui/help/data/xhtml.zip
Binary file helps_loc2/xdmsettingsui/help/data/xhtml.zip has changed
diff -r fc38b048ab2f -r b45fe1029b5d helps_loc2/xdmsettingsui/help/group/bld.inf
--- a/helps_loc2/xdmsettingsui/help/group/bld.inf	Mon May 03 13:39:39 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - Initial contribution
-* 
-* Contributors:
-* 
-* 
-* Description:
-* Export help related files.
-*
-*/
-
-				
-PRJ_EXPORTS
-:zip ../data/xhtml.zip   /epoc32/data/z/resource/ overwrite
-:zip ../data/xhtml.zip   /epoc32/winscw/c/resource/ overwrite
-
diff -r fc38b048ab2f -r b45fe1029b5d layers.sysdef.xml
--- a/layers.sysdef.xml	Mon May 03 13:39:39 2010 +0300
+++ b/layers.sysdef.xml	Fri May 14 17:04:40 2010 +0300
@@ -25,9 +25,6 @@
 			</module>
   	</layer>
     <layer name="app_layer">
-      <module name="helps_loc2">
-        <unit unitID="platform.helps_loc2" mrp="" bldFile="&layer_real_source_path;/helps_loc2/group" name="helps_loc2" />
-      </module>
       <module name="CI_external">
         <unit unitID="tools.CI_external" mrp="" bldFile="&layer_real_source_path;/foundation_system/sf_config/CI_external/group" name="CI_external" />
       </module>
diff -r fc38b048ab2f -r b45fe1029b5d sf_build/sf_prebuild/makefile
--- a/sf_build/sf_prebuild/makefile	Mon May 03 13:39:39 2010 +0300
+++ b/sf_build/sf_prebuild/makefile	Fri May 14 17:04:40 2010 +0300
@@ -6,12 +6,13 @@
 include /sf/os/devicesrv/commonservices/commonengine/makefile
 include /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile
 include /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile
-include /sf/mw/qttranslations/cmaker/makefile
+
 
 ifeq (S60,$(BUILD))
 include /sf/mw/uiresources/uigraphics/icons/makefile
 include /sf/mw/uiresources/uigraphics/bitmaps2/makefile
 include /sf/mw/platformtools/gfxconversion/mifconv/makefile_templates/makefile
+include /sf/mw/qttranslations/cmaker/makefile
 endif
  
 # Place the first target as the default target which is executed from this level 
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/Symbian_OS_vFuture.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vFuture.xml	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/Symbian_OS_vFuture.xml	Fri May 14 17:04:40 2010 +0300
@@ -54,6 +54,7 @@
     <!-- Dumping environment -->
     <Execute Component="Dumping all environment variables" Cwd="%BuildDir%" CommandLine="SET"/>
  
+	<Execute Component="Make Temp Dir" Cwd="%BuildDir%" CommandLine="mkdir D:\Builds\Temp"/>
      <!-- Get source code from TCL -->
     <Execute Component="Delta sync TCL sources" Cwd="%CleanSourceDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\perforce\P4GetSource.pl -f -s %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\cedarutils\tcl_in_mcl_sf_clientspec.txt -d %TCLDeltaCache% -p tcl -t for_mcl -c  %ChangelistNumber%"/>
 	
@@ -495,7 +496,10 @@
     <!--Stop Performance Monitoring -->
     <Execute Component="Stop PerfMon" Cwd="%SourceDir%\os\buildtools\bldsystemtools\commonbldutils\PerfMon" CommandLine="perl PerfMonControlStop.pl -p 1973"/>
     <Execute Component="Publish PerfMon Log" Cwd="%LogsDir%" CommandLine="xcopy PerfMon_%BuildNumber%.csv %PublishLocation%\%Type%\%BuildNumber%\logs\ /Z /I /Q"/>
-
+	
+	<!-- Remove CBR Temp Dir -->
+	<Execute Component="Delete Temp Folder" Cwd="%BuildDir%" CommandLine="rmdir D:\Builds\Temp /s /q"/>
+	
     <!--Publish the Full Logs Dir -->
     <Execute Component="Publish Full Logs Dir" Cwd="%BuildDir%" CommandLine="xcopy %LogsDir% %PublishLocation%\%Type%\logs\%BuildNumber% /E /Z /I /Q"/>
 
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/Symbian_OS_vtb101sf.xml
--- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf.xml	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf.xml	Fri May 14 17:04:40 2010 +0300
@@ -61,7 +61,7 @@
  
      <!-- Get source code from TCL -->
     <Execute Component="Delta sync TCL sources" Cwd="%CleanSourceDir%" CommandLine="perl %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\perforce\P4GetSource.pl -f -s %CleanSourceDir%\os\deviceplatformrelease\symbianosbld\cedarutils\tcl_in_mcl_sf_clientspec.txt -d %TCLDeltaCache% -p tcl -t for_mcl -c  %ChangelistNumber%"/>
-	
+		<Execute Component="Make Temp Dir" Cwd="%BuildDir%" CommandLine="mkdir D:\Builds\Temp"/>
 	<!-- Install cbr tools from latest green tcl build by sf zip package  -->
 	<Execute Component="Make temporary epoc32/relinfo Dir" Cwd="%BuildDir%" CommandLine="mkdir %EPOCROOT%epoc32\relinfo"/>
     <Execute Component="Get TCL sfreltools.ini" Cwd="%BuildDir%" CommandLine="copy %CleanSourceDir%\os\buildtools\bldsystemtools\commonbldutils\TCL_Support\sfreltools.ini %EPOCROOT%epoc32\relinfo\reltools.ini"/>
@@ -513,6 +513,9 @@
     <Execute Component="Stop PerfMon" Cwd="%SourceDir%\os\buildtools\bldsystemtools\commonbldutils\PerfMon" CommandLine="perl PerfMonControlStop.pl -p 1973"/>
     <Execute Component="Publish PerfMon Log" Cwd="%LogsDir%" CommandLine="xcopy PerfMon_%BuildNumber%.csv %PublishLocation%\%Type%\%BuildNumber%\logs\ /Z /I /Q"/>
 
+	<!-- Remove CBR Temp Dir -->
+	<Execute Component="Delete Temp Folder" Cwd="%BuildDir%" CommandLine="rmdir D:\Builds\Temp /s /q"/>
+	
     <!--Publish the Full Logs Dir -->
     <Execute Component="Publish Full Logs Dir" Cwd="%BuildDir%" CommandLine="xcopy %LogsDir% %PublishLocation%\%Type%\logs\%BuildNumber% /E /Z /I /Q"/>
 
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/inc/Symbian_OS_tb102sf.hrh
--- a/symbianosbld/cedarutils/inc/Symbian_OS_tb102sf.hrh	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/inc/Symbian_OS_tb102sf.hrh	Fri May 14 17:04:40 2010 +0300
@@ -2398,3 +2398,15 @@
 */
 #define SYMBIAN_E32_ATOMIC_API
 
+/**
+	@publishedAll
+
+	FF_EGL_SUPPORT_ENDPOINT_MMP
+	
+	EglEndPoint is an EGL Extension that allows an EGL application to get the current FrontBuffer 
+	on a stream of images (such as a video stream or the WindowSurface of an application). 
+	This supports advanced application transition effects
+	
+*/
+#define FF_EGL_SUPPORT_ENDPOINT_MMP
+
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/platform_paths.hrh
--- a/symbianosbld/cedarutils/platform_paths.hrh	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/platform_paths.hrh	Fri May 14 17:04:40 2010 +0300
@@ -461,6 +461,8 @@
 
 #define OS_LAYER_LIBOIL_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PLATFORM_EXPORT_PATH(stdapis/liboil)
 
+#define MW_LAYER_KHRONOS_SYSTEMINCLUDE SYSTEMINCLUDE MW_LAYER_PLATFORM_EXPORT_PATH(khronos)
+
 #define MW_LAYER_GSTREAMER_SYSTEMINCLUDE SYSTEMINCLUDE \
  /epoc32/include/platform/mw/gstreamer 
 
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_MMC_H4.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_MMC_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_MMC_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -17,7 +33,7 @@
 #define USE_SDIO_SD_MMC
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H4.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,13 +5,29 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
 #define SYMBIAN_BASE_USE_GCE
 #define SYMBIAN_GRAPHICS_USE_GCE
 #define SYMBIAN_INCLUDE_PUNYCODE
-#define SYMBIAN_EXCLUDE_MTP
+#undef __MTP_PROTOCOL_SUPPORT
 #define SYMBIAN_INCLUDE_USB_RNDIS
 #include <h4hrp.oby>
 #include <Techview.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H6.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Mature_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,13 +5,29 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
 #define SYMBIAN_BASE_USE_GCE
 #define SYMBIAN_GRAPHICS_USE_GCE
 #define SYMBIAN_INCLUDE_PUNYCODE
-#define SYMBIAN_EXCLUDE_MTP
+#undef __MTP_PROTOCOL_SUPPORT
 #define SYMBIAN_INCLUDE_USB_RNDIS
 #include <34xx_sdp.oby>
 #include <Techview.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Minimal_H6.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Minimal_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Minimal_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,7 @@
  * the system
  */
 
+#define FF_FMTX
 #define SYMBIAN_FLEXMM_ZERO_COPY_NETWORKING
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
@@ -15,8 +16,8 @@
 #define USE_MSCDB
 #define SYMBIAN_EXCLUDE_LOCATION
 #define SYMBIAN_EXCLUDE_DNS_PROXY
-#define SYMBIAN_EXCLUDE_MTP
-#define SYMBIAN_EXCLUDE_USB
+#undef __MTP_PROTOCOL_SUPPORT
+#undef __USB
 #define SSMA_MINIMAL_BOOT
 #include <34xx_sdp.oby>
 #include <Techview_ExcludeRemovable.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H4.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -14,7 +30,7 @@
 #define USE_MSCDB
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H6.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -14,7 +30,7 @@
 #define USE_MSCDB
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,23 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1S.oby
--- a/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1S.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/tb101sfrom_obys/GTC_Standard_NE1S.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,23 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_MMC_H4.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_MMC_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_MMC_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -17,7 +33,7 @@
 #define USE_SDIO_SD_MMC
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H4.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,13 +5,29 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
 #define SYMBIAN_BASE_USE_GCE
 #define SYMBIAN_GRAPHICS_USE_GCE
 #define SYMBIAN_INCLUDE_PUNYCODE
-#define SYMBIAN_EXCLUDE_MTP
+#undef __MTP_PROTOCOL_SUPPORT
 #define SYMBIAN_INCLUDE_USB_RNDIS
 #include <h4hrp.oby>
 #include <Techview.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H6.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Mature_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,13 +5,29 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
 #define SYMBIAN_BASE_USE_GCE
 #define SYMBIAN_GRAPHICS_USE_GCE
 #define SYMBIAN_INCLUDE_PUNYCODE
-#define SYMBIAN_EXCLUDE_MTP
+#undef __MTP_PROTOCOL_SUPPORT
 #define SYMBIAN_INCLUDE_USB_RNDIS
 #include <34xx_sdp.oby>
 #include <Techview.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Minimal_H6.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Minimal_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Minimal_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,7 @@
  * the system
  */
 
+#define FF_FMTX
 #define SYMBIAN_FLEXMM_ZERO_COPY_NETWORKING
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
@@ -15,8 +16,8 @@
 #define USE_MSCDB
 #define SYMBIAN_EXCLUDE_LOCATION
 #define SYMBIAN_EXCLUDE_DNS_PROXY
-#define SYMBIAN_EXCLUDE_MTP
-#define SYMBIAN_EXCLUDE_USB
+#undef __MTP_PROTOCOL_SUPPORT
+#undef __USB
 #define SSMA_MINIMAL_BOOT
 #include <34xx_sdp.oby>
 #include <Techview_ExcludeRemovable.oby>
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H4.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H4.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H4.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -14,7 +30,7 @@
 #define USE_MSCDB
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H6.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H6.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_H6.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,22 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
@@ -14,7 +30,7 @@
 #define USE_MSCDB
 #define SYMBIAN_INCLUDE_LOCATION_API_VARIANT2
 #define SYMBIAN_INCLUDE_DEFAULT_PM
-#define SYMBIAN_INCLUDE_BLUETOOTH_GPS_PM
+#define __BLUETOOTHGPSPSY
 #define SYMBIAN_INCLUDE_SIMULATION_PM
 #define SYMBIAN_INCLUDE_LOCATION_PRIVACY_REQUEST_APIS
 #define SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,23 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1S.oby
--- a/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1S.oby	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/cedarutils/vFuturerom_obys/GTC_Standard_NE1S.oby	Fri May 14 17:04:40 2010 +0300
@@ -5,6 +5,23 @@
  * the system
  */
 
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __IPSEC
+#define __DHCP
+#define __BLUETOOTHGPSPSY
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
 #define SYMBIAN_EXCLUDE_LIBXML2
 #define SYMBIAN_EXCLUDE_LIBXML2_SAX_CPARSER_PLUGIN
 #define SYMBIAN_EXCLUDE_LIBXML2_DOM_XPATH_API
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/productionbldcbrconfig/Future/reltools.ini
--- a/symbianosbld/productionbldcbrconfig/Future/reltools.ini	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/productionbldcbrconfig/Future/reltools.ini	Fri May 14 17:04:40 2010 +0300
@@ -11,7 +11,7 @@
 categorise_binaries
 categorise_exports
 diff_tool				windiff
-
+temp_dir				D:\Builds\Temp
 ignore_binary	\epoc32\engdoc\*
 use_distribution_policy_files_first
 
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/GCCXMLcomponents.txt	Fri May 14 17:04:40 2010 +0300
@@ -415,6 +415,7 @@
 obex	\sf\mw\remoteconn\obex\obexprotocol\group\obex.mrp
 obex_extensionapis	\sf\mw\remoteconn\obex\obexextensionapi\group\obex_extensionapis.mrp
 oeaddons_liboil	\sf\os\ossrv\genericopenlibs\liboil\group\oeaddons_liboil.mrp
+oeaddons_libpam	\sf\os\ossrv\genericopenlibs\pluggableauthenticationmodulefw\group\oeaddons_libpam.mrp
 oeaddons_librt	\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\group\oeaddons_librt.mrp
 oetools_telnetd	\sf\mw\appsupport\openenvutils\telnetserver\group\oetools_telnetd.mrp
 oetools_zsh	\sf\mw\appsupport\openenvutils\commandshell\group\oetools_zsh.mrp
@@ -445,6 +446,7 @@
 security_filetokens	\sf\os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp
 security_makekeys	\sf\mw\appinstall\secureswitools\makekeys\group\security_makekeys.mrp
 security_metadata	\sf\os\security\security_info\security_metadata\security_metadata.mrp
+security_mtputils	\sf\os\security\contentmgmt\mtputils\group\security_mtputils.mrp
 security_openssl	\sf\mw\appinstall\secureswitools\openssllib\security_openssl.mrp
 security_reccafconfig	\sf\os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp
 security_referenceapplicationmanager	\sf\mw\appinstall\installationservices\refsoftwareappmgr\group\security_referenceapplicationmanager.mrp
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt
--- a/symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/GTcomponents.txt	Fri May 14 17:04:40 2010 +0300
@@ -468,6 +468,7 @@
 obex	\sf\mw\remoteconn\obex\obexprotocol\group\obex.mrp
 obex_extensionapis	\sf\mw\remoteconn\obex\obexextensionapi\group\obex_extensionapis.mrp
 oeaddons_liboil	\sf\os\ossrv\genericopenlibs\liboil\group\oeaddons_liboil.mrp
+oeaddons_libpam	\sf\os\ossrv\genericopenlibs\pluggableauthenticationmodulefw\group\oeaddons_libpam.mrp
 oeaddons_librt	\sf\os\ossrv\genericopenlibs\posixrealtimeextensions\group\oeaddons_librt.mrp
 oetools_telnetd	\sf\mw\appsupport\openenvutils\telnetserver\group\oetools_telnetd.mrp
 oetools_zsh	\sf\mw\appsupport\openenvutils\commandshell\group\oetools_zsh.mrp
@@ -498,6 +499,7 @@
 security_filetokens	\sf\os\security\cryptoservices\filebasedcertificateandkeystores\group\security_filetokens.mrp
 security_makekeys	\sf\mw\appinstall\secureswitools\makekeys\group\security_makekeys.mrp
 security_metadata	\sf\os\security\security_info\security_metadata\security_metadata.mrp
+security_mtputils	\sf\os\security\contentmgmt\mtputils\group\security_mtputils.mrp
 security_openssl	\sf\mw\appinstall\secureswitools\openssllib\security_openssl.mrp
 security_reccafconfig	\sf\os\security\contentmgmt\cafrecogniserconfig\security_reccafconfig.mrp
 security_referenceapplicationmanager	\sf\mw\appinstall\installationservices\refsoftwareappmgr\group\security_referenceapplicationmanager.mrp
diff -r fc38b048ab2f -r b45fe1029b5d symbianosbld/productionbldcbrconfig/tb101sf/reltools.ini
--- a/symbianosbld/productionbldcbrconfig/tb101sf/reltools.ini	Mon May 03 13:39:39 2010 +0300
+++ b/symbianosbld/productionbldcbrconfig/tb101sf/reltools.ini	Fri May 14 17:04:40 2010 +0300
@@ -11,7 +11,7 @@
 categorise_binaries
 categorise_exports
 diff_tool				windiff
-
+temp_dir				D:\Builds\Temp
 ignore_binary	\epoc32\engdoc\*
 use_distribution_policy_files_first