1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-08 15:20:44 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/12140] Remove the diff class / MOD text build script

Conflicts:
	build/build_diff.php
This commit is contained in:
Andreas Fischer
2014-02-02 14:01:39 +01:00
3 changed files with 0 additions and 2121 deletions

View File

@@ -165,8 +165,6 @@
<target name="package" depends="clean,prepare,prepare-new-version,old-version-diffs">
<exec dir="build" command="php -f package.php '${versions}' > logs/package.log" escape="false" />
<exec dir="build" command="php -f build_diff.php '${prevversion}' '${newversion}' > logs/build_diff.log" escape="false" />
<exec dir="build" escape="false"
command="diff -crNEBwd old_versions/release-${prevversion}/language new_version/phpBB3/language >
save/save_${prevversion}_to_${newversion}/language/phpbb-${prevversion}_to_${newversion}_language.patch" />