summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2>2006-08-06 14:58:11 +0000
committerhajny <hajny@3ad0048d-3df7-0310-abae-a5850022a9f2>2006-08-06 14:58:11 +0000
commitd70029604a408e8ca4a5178e1532a2bbe8df12db (patch)
tree4eb48898bbf4f65561a225505717003b096ddec0
parentb5208aa2e630420e9a4f5bbcfce51dcba0026c7d (diff)
downloadfpc-d70029604a408e8ca4a5178e1532a2bbe8df12db.tar.gz
Merged revisions 4367 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk ........ r4367 | hajny | 2006-08-06 11:44:43 +0200 (Sun, 06 Aug 2006) | 1 line * the last forgotten Mircosoft ;-) ........ git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_0@4375 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--compiler/msg/errorf.msg2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/msg/errorf.msg b/compiler/msg/errorf.msg
index d157bc6421..ab103a512e 100644
--- a/compiler/msg/errorf.msg
+++ b/compiler/msg/errorf.msg
@@ -1833,7 +1833,7 @@ option_help_pages=11025_[
3*2Anasmcoff_fichier COFF (Go32v2) avec Nasm
3*2Anasmelf_fichier ELF32 (Linux) avec Nasm
3*2Anasmobj_fichier OBJ avec Nasm
-3*2Amasm_fichier OBJ avec Masm (Mircosoft)
+3*2Amasm_fichier OBJ avec Masm (Microsoft)
3*2Atasm_fichier OBJ avec Tasm (Borland)
3*2Acoff_coff (Go32v2) using internal writer
3*2Apecoff_pecoff (Win32) using internal writer