Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:15:53 +0000
branchCompilerCompatibility
changeset 9 7e9ef0db0a3d
parent 7 53c7f3ef2709 (diff)
parent 6 e7dfaa7b0b8d (current diff)
Automatic merge from PDK_3.0.h
networkcontrol/ipupsplugins/dialogcreator/bwins/ipupsdialogu.def
networkcontrol/ipupsplugins/dialogcreator/eabi/ipupsdialogu.def
networkcontrol/ipupsplugins/dialogcreator/group/bld.inf
networkcontrol/ipupsplugins/dialogcreator/group/ipupsdialog.iby
networkcontrol/ipupsplugins/dialogcreator/group/ipupsdialog.mmp
networkcontrol/ipupsplugins/dialogcreator/inc/ipupsconst.h
networkcontrol/ipupsplugins/dialogcreator/inc/ipupsdialog.h
networkcontrol/ipupsplugins/dialogcreator/resource/10285A7B.rss
networkcontrol/ipupsplugins/dialogcreator/source/ipupsconst.cpp
networkcontrol/ipupsplugins/dialogcreator/source/ipupsdialog.cpp
networkcontrol/ipupsplugins/group/bld.inf
networkcontrol/ipupsplugins/group/networking_ipups.mrp
networkcontrol/ipupsplugins/policyfile/ups_101F7989_10281DD8.rss
networkcontrol/ipupsplugins/test/te_ipups/data/te_ipups.ini
networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.iby
networkcontrol/ipupsplugins/test/te_ipups/group/te_ipups.mmp
networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_delete_decision_db.h
networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_notify_count.h
networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_server.h
networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_stepbase.h
networkcontrol/ipupsplugins/test/te_ipups/inc/te_ipups_ups_step.h
networkcontrol/ipupsplugins/test/te_ipups/policyfile/ups_10285B91_10281DD8.rss
networkcontrol/ipupsplugins/test/te_ipups/policyfile/ups_test_always_101F7989_10281DD8.rss
networkcontrol/ipupsplugins/test/te_ipups/scripts/te_ipups.script
networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_delete_decision_db.cpp
networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_notify_count.cpp
networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_server.cpp
networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_stepbase.cpp
networkcontrol/ipupsplugins/test/te_ipups/src/te_ipups_ups_step.cpp