summaryrefslogtreecommitdiff
path: root/src/engine/SCons/Tool/msvc.xml
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 06:58:30 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 06:58:30 +0100
commitdcffe49265eb5d1255b96fcbdba58a50db879fee (patch)
tree498cf4db1a14292430c9fc19a572419b1dac866d /src/engine/SCons/Tool/msvc.xml
parent8f2056eedecb0c2a7d794b78343d82cae50ffc38 (diff)
parente20c9557371eacec533588d33b4bebd543ba178f (diff)
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
Diffstat (limited to 'src/engine/SCons/Tool/msvc.xml')
-rw-r--r--src/engine/SCons/Tool/msvc.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/msvc.xml b/src/engine/SCons/Tool/msvc.xml
index b5933c4..14ce811 100644
--- a/src/engine/SCons/Tool/msvc.xml
+++ b/src/engine/SCons/Tool/msvc.xml
@@ -86,7 +86,7 @@ file as the second element. Normally the object file is ignored.
This builder method is only
provided when Microsoft Visual C++ is being used as the compiler.
The PCH builder method is generally used in
-conjuction with the PCH construction variable to force object files to use
+conjunction with the PCH construction variable to force object files to use
the precompiled header:
</para>