# HG changeset patch # User timkelly # Date 1281545550 18000 # Node ID 1d57e533b09e5a954cb166271dd6930e30e9aaa2 # Parent c13983cc56300b8e360df78970d5527c146f17ca# Parent 1c8169798acdf0d5906f526222da336ba5698dba merge from default diff -r c13983cc5630 -r 1d57e533b09e connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java --- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Aug 11 11:18:20 2010 -0500 +++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/AbstractConnectedService2.java Wed Aug 11 11:52:30 2010 -0500 @@ -225,4 +225,9 @@ public void setDeviceOS(String familyName, Version version) { // @deprecated } + + + public void setDeviceOS(String familyName, String version) { + // empty implementation + } } \ No newline at end of file diff -r c13983cc5630 -r 1d57e533b09e core/com.nokia.carbide.cpp.compiler.doc.user/html/images/mwccsym2_version.png Binary file core/com.nokia.carbide.cpp.compiler.doc.user/html/images/mwccsym2_version.png has changed diff -r c13983cc5630 -r 1d57e533b09e core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm --- a/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm Wed Aug 11 11:18:20 2010 -0500 +++ b/core/com.nokia.carbide.cpp.compiler.doc.user/html/introduction/new_features.htm Wed Aug 11 11:52:30 2010 -0500 @@ -15,6 +15,11 @@

New Features & Bug Fixes

A list of bug fixes for the compiler and linker can be found in the Symbian_x86_BuildTools_Notes.txt file located in the <Carbide_Install_Dir>\x86Build\Release_Notes directory. The latest build information is always available on the Symbian Foundation Wiki under WINSCW (build version information).

This reference has new and updated topics:

+
3.2.5 Build 490
+ +
3.2.5 Build 489