From bab6cc3faa7e146b7d3fec19b71150e92240bdda Mon Sep 17 00:00:00 2001
From: Andrew Niefer <aniefer@ca.ibm.com>
Date: Wed, 28 Jul 2004 21:54:46 +0000
Subject: [PATCH] patch from Tanya Wolff TVT fix for 70161

---
 core/org.eclipse.cdt.core/ChangeLog         | 7 ++++---
 core/org.eclipse.cdt.core/plugin.properties | 1 +
 core/org.eclipse.cdt.core/plugin.xml        | 2 +-
 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>