# HG changeset patch
# User timkelly
# Date 1256153288 18000
# Node ID 37c8331f98f7ed6f296be470027ea1e7a2fcc7fc
# Parent  99a1b28cd34c4cf6897e428a25c7ff668bc3221a# Parent  6f1a6fa739006e549b749b60f351cb1eae2f0406
merge commit

diff -r 6f1a6fa73900 -r 37c8331f98f7 core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs
--- a/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Wed Oct 21 14:24:11 2009 -0500
+++ b/core/com.nokia.carbide.cpp/.settings/org.eclipse.core.resources.prefs	Wed Oct 21 14:28:08 2009 -0500
@@ -1,5 +1,4 @@
-#Tue May 09 11:29:12 CDT 2006
+#Wed Oct 21 14:27:41 CDT 2009
 eclipse.preferences.version=1
 encoding/about.ini=UTF-8
-encoding/config.ini=UTF-8
 encoding/plugin_customization.ini=UTF-8
diff -r 6f1a6fa73900 -r 37c8331f98f7 core/com.nokia.carbide.cpp/config.ini
--- a/core/com.nokia.carbide.cpp/config.ini	Wed Oct 21 14:24:11 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-# Eclipse runtime configuration file
-# This file contains a number of key/value pairs that are merged into the 
-# System properties on system startup.  The values control the way the 
-# runtime is structured and runs.
-
-# Note:  Only platform:/base/ and file: URLs are supported.  In general the 
-# URLs given may include a version number (e.g., .../location_1.2.3).  
-# If a version is not specified, the system binds
-# to the location which matches exactly or to the versioned location with the
-# latest version number.  If a version number is given then only exact matches
-# are considered.
-
-# The comma-separated list of locations to search for the splash screen file (splash.bmp).
-# For each list element a subdirectory structure based on the pattern nl/<locale> is searched.
-# The system binds to the first matching file.  There is no default value.
-osgi.splashPath = platform:/base/plugins/com.nokia.carbide.cpp
-
-# The comma-separated list of bundles which are automatically installed and optionally started
-# once the system is up and running.  Each entry if of the form
-#     <URL | simple bundle location>[@ [<startlevel>] [":start"]]
-# If the startlevel is omitted then the framework will use the default start level for the bundle.
-# If the "start" tag is added then the bundle will be marked as started after being installed.
-# Simple bundle locations are interepreted as relative to the framework's parent directory.
-# The startlevel indicates the OSGi start level at which the bundle should run.
-# If this value is not set, the system computes an appropriate default.
-osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@3:start, org.eclipse.core.runtime@start
-
-# The product to run.  A given Eclipse configuration may contain many products.
-# The product identified will supply the branding (window icons, title bar text) etc 
-# as well as define the default application to run.  
-#eclipse.product=org.eclipse.platform.ide
-eclipse.product=com.nokia.carbide.cpp.product
-
-# The default workspace location
-#osgi.instance.area.default=@user.home/workspace
-# Default to a name without spaces. Many Symbian Perl scripts will fail on paths with spaces in them.
-osgi.instance.area.default=C:/Symbian/Carbide/workspace
-
-# The build identifier
-eclipse.buildId=I20080617-2000