Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2004-07-28 21:54:46 +0000
committerAndrew Niefer2004-07-28 21:54:46 +0000
commitbab6cc3faa7e146b7d3fec19b71150e92240bdda (patch)
tree92a645a91f1207ec84429d427a673a36bd4aa61f
parent89010e954fb3aba20006dad901f0739fc8526bb0 (diff)
downloadorg.eclipse.cdt-bab6cc3faa7e146b7d3fec19b71150e92240bdda.tar.gz
org.eclipse.cdt-bab6cc3faa7e146b7d3fec19b71150e92240bdda.tar.xz
org.eclipse.cdt-bab6cc3faa7e146b7d3fec19b71150e92240bdda.zip
patch from Tanya Wolff TVT fix for 70161
-rw-r--r--core/org.eclipse.cdt.core/ChangeLog7
-rw-r--r--core/org.eclipse.cdt.core/plugin.properties1
-rw-r--r--core/org.eclipse.cdt.core/plugin.xml2
3 files changed, 6 insertions, 4 deletions
diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index b4877276c27..7b26cb38913 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,7 +1,8 @@
-2004-07-26 Alain Magloire
+2004-07-28 Tanya Wolff
- Fix for PR 68665
- * utils/org/eclipse/cdt/utils/coff/PE.java
+ Fix for PR 70161: Assembly untranslated in C++ File Types
+ * plugin.properties
+ * plugin.xml
2004-07-26 Vladimir Hirsl
diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index 8f4805110a3..1fabec01da0 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -41,6 +41,7 @@ CDTVisualCErrorParser.name=CDT Visual C Error Parser
PathEntryContainerInitializer=Path Entry Container Initializer
+fileTypeMapping.AssemblyLanguage=Assembly
fileTypeMapping.cSourceFile=C Source File
fileTypeMapping.cppSourceFile=C++ Source File
fileTypeMapping.assemblySourceFile=Assembly Source File
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 5b7b753949e..229a780a399 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -247,7 +247,7 @@
id="org.eclipse.cdt.core.language.cxx">
</language>
<language
- name="Assembly"
+ name="%fileTypeMapping.AssemblyLanguage"
id="org.eclipse.cdt.core.language.asm">
</language>
</extension>

Back to the top