phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp
branchRCL_3
changeset 68 9da50d567e3c
parent 63 f4a778e096c2
child 85 38bb213f60ba
equal deleted inserted replaced
63:f4a778e096c2 68:9da50d567e3c
    15  *
    15  *
    16  */
    16  */
    17 
    17 
    18 // Phonebook2 includes
    18 // Phonebook2 includes
    19 #include <Pbk2AddressTools.h>
    19 #include <Pbk2AddressTools.h>
    20 #include <Pbk2UIControls.rsg>
    20 #include <pbk2uicontrols.rsg>
    21 #include <CPbk2PresentationContact.h>
    21 #include <CPbk2PresentationContact.h>
    22 #include <CPbk2PresentationContactFieldCollection.h>
    22 #include <CPbk2PresentationContactFieldCollection.h>
    23 #include <CPbk2PresentationContactField.h>
    23 #include <CPbk2PresentationContactField.h>
    24 #include <MPbk2FieldProperty.h>
    24 #include <MPbk2FieldProperty.h>
    25 
    25