merge from default C3_BUILDER_WORK
authortimkelly
Wed, 25 Aug 2010 11:08:33 -0500
branchC3_BUILDER_WORK
changeset 1880 c71aea166ff8
parent 1879 5486b48b06ad (current diff)
parent 1878 6507baa94ab8 (diff)
child 1881 fccb2e8f8b9b
merge from default
Binary file connectivity/com.nokia.carbide.remoteConnections/icons/serviceTest.png has changed
Binary file connectivity/com.nokia.carbide.remoteConnections/icons/serviceTest_No.png has changed
Binary file core/com.nokia.carbide.bugreport-feature/Carbide_Image.png has changed
Binary file core/com.nokia.carbide.cpp-feature/Carbide_Image.png has changed
Binary file core/com.nokia.carbide.cpp.codescanner-feature/Carbide_Image.png has changed
Binary file core/com.nokia.carbide.cpp.sysdoc.hover-feature/Carbide_Image.png has changed
Binary file core/com.nokia.carbide.cpp/icons/Carbide_c_flat.ico has changed
Binary file core/com.nokia.carbide.cpp/icons/about_cpp.png has changed
Binary file core/com.nokia.carbide.search.system-feature/Carbide_Image.png has changed
Binary file core/com.nokia.carbide.search.system/icons/Carbide_c_icon_32x32.png has changed