diff hotspot/.settings/org.eclipse.core.runtime.prefs @ 4272:75c951399c65

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 11 Jan 2012 18:25:56 +0100
parents e53926b0a6cb
children
line wrap: on
line diff
--- a/hotspot/.settings/org.eclipse.core.runtime.prefs	Wed Jan 11 18:25:25 2012 +0100
+++ b/hotspot/.settings/org.eclipse.core.runtime.prefs	Wed Jan 11 18:25:56 2012 +0100
@@ -1,6 +1,6 @@
 #Wed Sep 01 16:13:40 PDT 2010
 content-types/enabled=true
-content-types/org.eclipse.cdt.core.cHeader/file-extensions=hpp,incl
+content-types/org.eclipse.cdt.core.cxxHeader/file-extensions=hpp,incl
 content-types/org.eclipse.cdt.core.cxxSource/file-extensions=cpp
 eclipse.preferences.version=1