Made a minor error with all the messing around with aknlayout.lag which meant it got performed on the default branch.

removed another .cproject carbide file, which was present in the other branch and made it through the merge.

Merged in kashif's, fdim's and my removal of abld.bat and .cproject files onto the fixed up version of Christian's head.

Attempted fix for AknLayout.lag appearing twice in the same location, but with different cases. This is a bit experimental as I'm doing it on a windows machine (case insensitive), so we'll see how we go.

Removed all abld.bat and .cproject files as they rpobably shouldn't be committed, and are just going to cause unneccessary merge/build issues

Merging in kashif's additional head into fdim's

Merged from FCL, GCC-E compilation error in homescreensrv (2098) fixed by Leo Zhengyh

Added folder hs_app_idlefw, files there have 'hs_app' prefix(content edited). homescreen_srv compiles with these changes. Although more warnings appear. Also I've changed uid of homescreen.exe, ailaunch.exe. Renamed idlefw files, located in hs_app_idlefw.

Merge.

Fixed "extra qualification" syntax errors.

Bug 1726 - GCC-E compilation error in homescreensrv (2098)

added files required to compile homescreen user: kashif.sayed

Merge v5backport

remove mifconv sources

add new mifconv

updated dependencies

added few more dependencies

added dependencies to bld.inf; whole package builds now with winscw

COrrect previous fix for Bug 1960 - needs an extra ../ in the path to the aisystemuids.hrh file

added missing files user: kashif.sayed added dependencies/AknTaskList.h added dependencies/DRMEvent.h added dependencies/DRMEventObserver.h added dependencies/DRMNotifier.h added dependencies/SchemeDefs.hrh added dependencies/SchemeHandler.h added dependencies/SchemeHandler.inl added dependencies/aiwcommon.hrh added dependencies/aiwdialdata.h added dependencies/drmrightsinfo.h added dependencies/drmutilitytypes.h added dependencies/javaattribute.h added dependencies/javadomainpskeys.h added dependencies/javaregistry.h added dependencies/javaregistryapplicationentry.h added dependencies/javaregistryentry.h added dependencies/javaregistryentrytype.h added dependencies/javaregistrypackageentry.h added dependencies/mjavaattribute.h added dependencies/swi/bld.inf added dependencies/swi/sispackagetrust.h added dependencies/swi/sisregistryentry.h added dependencies/swi/sisregistrylog.h added dependencies/swi/sisregistrysession.h changed .cproject changed dependencies/S3libs/bld.inf changed dependencies/bld.inf

user: kashif.sayed added contentcontrolsrv/.cproject added contentcontrolsrv/.project added contentcontrolsrv/group/ABLD.BAT added contentpublishingsrv/.cproject added contentpublishingsrv/.project added contentpublishingsrv/contentharvester/.cproject added contentpublishingsrv/contentharvester/.project added contentpublishingsrv/contentharvester/contentharvesterclient/group/ABLD.BAT added contentpublishingsrv/contentharvester/contentharvesterserver/group/ABLD.BAT added contentpublishingsrv/contentharvester/contentharvesterswiplugin/group/ABLD.BAT added contentpublishingsrv/contentharvester/factorysettingsplugin/group/ABLD.BAT added contentpublishingsrv/contentharvester/group/ABLD.BAT added contentpublishingsrv/group/ABLD.BAT added dependencies/S3libs/cpswrapper.lib added dependencies/S3libs/hscontentcontrol.lib added dependencies/S3libs/hspswrapper.lib added group/ABLD.BAT added homescreenpluginsrv/group/ABLD.BAT added homescreensrv_plat/group/ABLD.BAT added idlefw/group/ABLD.BAT added inc/ccontentmap.h added inc/cpdebug.h added inc/cpglobals.h added inc/cpliwmap.h added inc/cpluginvalidator.h added inc/cpserverdef.h added inc/cpublisherregistrymap.h added inc/mcssathandler.h added menucontentsrv/group/ABLD.BAT added xcfw/group/ABLD.BAT changed dependencies/S3libs/bld.inf

user: kashif.sayed added dependencies/domaindefs.h added dependencies/domainpolicy.h added dependencies/ssm/ssmstates.hrh changed dependencies/bld.inf changed dependencies/ssm/bld.inf

user: kashif.sayed added dependencies/ssm/ssmdomaindefs.h added dependencies/ssm/ssmstate.h added dependencies/ssm/ssmstateawaresession.h changed dependencies/ssm/bld.inf

. user: kashif.sayed branch 'v5backport' changed dependencies/bld.inf

Dependencies for idlefw user: kashif.sayed branch 'v5backport'

.

Move the export of aisystemuids.hrh to the idlefw_api, as a revised fix for Bug 1960

Merge in fix for bug 399

added dependencies headers and libs

added dependencies for homescreen package