Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:11:16 +0000
branchCompilerCompatibility
changeset 8 27d173b4aadf
parent 6 f5380f579f8b (diff)
parent 5 eed911ae68f2 (current diff)
child 11 c1efdb9c339d
Automatic merge from PDK_3.0.h
sipplugins/sippsipsettingsui/inc/gssiptimer.h
sipplugins/sippsipsettingsui/src/gssiptimer.cpp
sipplugins/sippsipsettingsui/tsrc/UT_sipsettingsui/inc/ut_gssiptimer.h
sipplugins/sippsipsettingsui/tsrc/UT_sipsettingsui/src/ut_gssiptimer.cpp