tizen2.1 code merge
authorAmith Kumar Mahale <amith.m@samsung.com>
Thu, 6 Jun 2013 09:31:12 +0000 (15:01 +0530)
committerAmith Kumar Mahale <amith.m@samsung.com>
Thu, 6 Jun 2013 09:31:12 +0000 (15:01 +0530)
commitb669e35b258dbe25bdf738fcc630eb662ea20643
tree4eaa6b248fc655b88540c24d767ad72b36eadac1
parentc2d56f706b2044f83221f0eadffa6f19ea200ea8
tizen2.1 code merge

Change-Id: I774060ede242e0d9558c64bed40c3bd9d3a2ced9
Signed-off-by: Amith Kumar Mahale <amith.m@samsung.com>
18 files changed:
inc/CallActiveCallForm.h
inc/CallEndCallForm.h
inc/CallTypes.h
manifest.xml
res/eng-GB.xml
res/screen-size-normal/IDL_CONFCALL_FORM.xml
res/screen-size-normal/IDL_MULTIPLE_CALL_FORM.xml
src/CallActiveCallForm.cpp
src/CallApp.cpp
src/CallAppFrame.cpp
src/CallBaseForm.cpp
src/CallConfCallerListForm.cpp
src/CallEndCallForm.cpp
src/CallIncomingCallForm.cpp
src/CallOptionPopup.cpp
src/CallPresentationModel.cpp
src/CallTelephonyManager.cpp
src/CallTypes.cpp