merge heads
authorcawthron
Wed, 29 Apr 2009 15:43:35 -0500
changeset 135 b672c2dae840
parent 134 87b78ba99140 (diff)
parent 133 ad6982151613 (current diff)
child 137 cb21b2ba1f9d
merge heads
--- a/core/com.nokia.carbide.cpp/about.mappings	Wed Apr 29 14:43:11 2009 -0500
+++ b/core/com.nokia.carbide.cpp/about.mappings	Wed Apr 29 15:43:35 2009 -0500
@@ -6,4 +6,5 @@
 # The following should contain the build version.
 # e.g. "0=20020612"
 # This value will be added automaticaly via the build scripts
-0=@buildNumber@
\ No newline at end of file
+0=@buildNumber@
+1=
--- a/core/com.nokia.carbide.cpp/plugin.properties	Wed Apr 29 14:43:11 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Wed Apr 29 15:43:35 2009 -0500
@@ -5,7 +5,7 @@
 
 CHEAT_SHEETS = Cheat Sheets
 CHEAT_SHEETS_MENU = &Cheat Sheets...
-productBlurb=Build {0}\n\
+productBlurb=Build {0} {1}\n\
 Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://www.forum.nokia.com/\n\
 This product includes software developed by Eclipse Project.\n\