aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-02-04 13:03:02 +0100
committerNils Adermann <naderman@naderman.de>2014-02-04 13:03:02 +0100
commitc955d0145697fb866aefd1454127218b976009cd (patch)
tree865e4ae11d379ec7af19329ae79c7d1876618833
parent39b9274a9404647632a5c210c4331377b5ce157b (diff)
parentaae4d4c90d447754dbf1d10b09c29f38b96a650a (diff)
downloadforums-c955d0145697fb866aefd1454127218b976009cd.tar
forums-c955d0145697fb866aefd1454127218b976009cd.tar.gz
forums-c955d0145697fb866aefd1454127218b976009cd.tar.bz2
forums-c955d0145697fb866aefd1454127218b976009cd.tar.xz
forums-c955d0145697fb866aefd1454127218b976009cd.zip
Merge remote-tracking branch 'github-nickvergessen/ticket/12162' into develop-olympus
* github-nickvergessen/ticket/12162: [ticket/12162] Set language to C before running diff to ensure its english
-rw-r--r--build/build.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml
index e82e61a18e..83ddcd29c4 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -105,7 +105,7 @@
<property name="dir" value="build/old_versions/release-${version}" />
</phingcall>
- <exec dir="build/old_versions" command="diff -crNEBwd release-${version} release-${newversion} >
+ <exec dir="build/old_versions" command="LC_ALL=C diff -crNEBwd release-${version} release-${newversion} >
../new_version/patches/phpBB-${version}_to_${newversion}.patch" escape="false" />
</target>