# HG changeset patch
# User cawthron
# Date 1241037815 18000
# Node ID b672c2dae840dcde97f9c0111f5275e67f8a15a3
# Parent  87b78ba991409d3884928ef45c1d7f0cc9201e2c# Parent  ad6982151613dc740ff944b674c9545ab4fc010d
merge heads

diff -r ad6982151613 -r b672c2dae840 core/com.nokia.carbide.cpp/about.mappings
--- 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=
diff -r ad6982151613 -r b672c2dae840 core/com.nokia.carbide.cpp/plugin.properties
--- 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\