Mercurial Mercurial > oss > FCL > sf > mw > inputmethods / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fep/aknfep/help/rom/fephelps_variant.iby
author Shabe Razvi <shaber@symbian.org>
Thu, 02 Sep 2010 15:52:50 +0100
branchRCL_3
changeset 45 6f51b41715c8
parent 44 ecbabf52600f
permissions -rw-r--r--
Merge RCL_3 fixes with reverted delivery
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
44
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     1
 
/*
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     2
 
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     3
 
* All rights reserved.
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     4
 
* This component and the accompanying materials are made available
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     5
 
* under the terms of "Eclipse Public License v1.0""
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     6
 
* which accompanies this distribution, and is available
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     7
 
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     8
 
*
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
     9
 
* Initial Contributors:
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    10
 
* Nokia Corporation - initial contribution.
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    11
 
*
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    12
 
* Contributors:
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    13
 
*
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    14
 
* Description:
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    15
 
*
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    16
 
*/
ecbabf52600f Revert incorrect RCL_3 drop:
Pat Downey <patd@symbian.org>
parents:
diff changeset 
    17
 












ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    18














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    19














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    20














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    21














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    22














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    23














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    24














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    25














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    26














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    27


#ifndef  __AKNFEPHELPS_VARIANT_IBY__













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    28


#define  __AKNFEPHELPS_VARIANT_IBY__













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    29














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    30


#if defined(FF_S60_HELPS_IN_USE)













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    31


    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x100056de\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x100056de\contents.zip)













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    32


    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x100056de\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x100056de\index.xml)













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    33


    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x100056de\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x100056de\keywords.xml)













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    34


    data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x100056de\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x100056de\meta.xml)













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    35


#endif













ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    36














ecbabf52600f
Revert incorrect RCL_3 drop:



Pat Downey <patd@symbian.org>


parents: 

diff
changeset




    37


#endif














FCL/sf/mw/inputmethods