Merge after removal of incorrect RCL_3 drop RCL_3 PDK_3.0.2
authorandy simpson <andrews@symbian.org>
Thu, 02 Sep 2010 17:20:00 +0100
branchRCL_3
changeset 258 880ff05ad710
parent 251 900f5acf95f8 (current diff)
parent 257 3e88ff8f41d5 (diff)
child 264 cbb906b0db9b
Merge after removal of incorrect RCL_3 drop
bsptemplate/asspandvariant/template_variant/bld.inf
bsptemplate/asspandvariant/template_variant/camerasc/camerasc.cpp
bsptemplate/asspandvariant/template_variant/camerasc/camerasc_plat.h
bsptemplate/asspandvariant/template_variant/camerasc/camerasc_sensor.cpp
bsptemplate/asspandvariant/template_variant/camerasc/logoyuv2.cpp
bsptemplate/asspandvariant/template_variant/camerasctemplate.mmp
kernel/eka/common/heap.cpp
kernel/eka/debug/securityServer/inc/c_security_svr_async.h
kernel/eka/debug/securityServer/inc/c_security_svr_session.h
kernel/eka/debug/securityServer/inc/rm_debug_logging.h
kernel/eka/debug/securityServer/src/c_process_pair.cpp
kernel/eka/debug/securityServer/src/c_security_svr_async.cpp
kernel/eka/debug/securityServer/src/c_security_svr_server.cpp
kernel/eka/debug/securityServer/src/c_security_svr_session.cpp
kernel/eka/drivers/camerasc/bld.inf
kernel/eka/drivers/camerasc/cameraldd.cpp
kernel/eka/drivers/debug/rmdebug/d_debug_agent.cpp
kernel/eka/drivers/debug/rmdebug/d_debug_agent.h
kernel/eka/drivers/debug/rmdebug/d_list_manager.cpp
kernel/eka/drivers/debug/rmdebug/d_process_tracker.cpp
kernel/eka/drivers/debug/rmdebug/d_rmd_breakpoints.cpp
kernel/eka/drivers/debug/rmdebug/d_rmd_breakpoints.h
kernel/eka/drivers/debug/rmdebug/d_rmd_stepping.cpp
kernel/eka/drivers/debug/rmdebug/d_target_process.cpp
kernel/eka/drivers/debug/rmdebug/rm_debug_eventhandler.cpp
kernel/eka/drivers/debug/rmdebug/rm_debug_kerneldriver.cpp
kernel/eka/drivers/pbus/mmc/sdcard/eabi/sdcard3c/epbusmu.def
kernel/eka/include/d32camerasc.h
kernel/eka/include/d32camerasc.inl
kernel/eka/include/drivers/camerasc.h
kernel/eka/include/drivers/rm_debug_eventhandler.h
kernel/eka/rombuild/f32tests.oby
kerneltest/e32test/group/t_camera_api.mmp
kerneltest/e32test/group/t_camera_gen.mmp
kerneltest/e32test/multimedia/t_camera_api.cpp
kerneltest/e32test/multimedia/t_camera_gen.cpp
kerneltest/e32test/power/t_domain.cpp
kerneltest/e32test/rm_debug/basic_tests/t_rmdebug2.cpp
kerneltest/e32test/rm_debug/basic_tests/t_rmdebug2.h
kerneltest/e32test/rm_debug/common/t_target_launcher.cpp
kerneltest/e32test/rm_debug/debug_targets/d_rmdebug_step_test.s
kerneltest/e32test/rm_debug/debug_targets/d_rmdebugthread2.cpp
kerneltest/e32test/rm_debug/debug_targets/t_rmdebug_app.cpp
kerneltest/e32test/rm_debug/group/t_rmdebug2.mmh
kerneltest/e32test/rm_debug/multi_target_tests/t_multi_target.cpp
kerneltest/e32utils/group/bld.inf
userlibandfileserver/fileserver/ftrace/d_ftrace.cpp
userlibandfileserver/fileserver/group/efile.mmh