aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-06 03:33:16 +0100
committerNils Adermann <naderman@naderman.de>2010-03-06 03:33:16 +0100
commit797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6 (patch)
treeec0e46b4091f89f405d11473f84b616450b5f966 /phpBB/develop
parent693a2dc99bf07aeac1865d4a48ddf2589317ac7a (diff)
parent568fb83373361abb8c9f3886fee944a8d9e5f66d (diff)
downloadforums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.gz
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.bz2
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.xz
forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.zip
Merge branch 'develop-olympus' into develop
Diffstat (limited to 'phpBB/develop')
-rwxr-xr-xphpBB/develop/fix_files.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/develop/fix_files.sh b/phpBB/develop/fix_files.sh
index d2207289dc..bf58e49e5f 100755
--- a/phpBB/develop/fix_files.sh
+++ b/phpBB/develop/fix_files.sh
@@ -14,7 +14,7 @@ find . > FILELIST.$$
grep -sv FILELIST FILELIST.$$ > FILELIST2.$$
grep -sv $(basename $0) FILELIST2.$$ > FILELIST.$$
grep -sv "^\.$" FILELIST.$$ > FILELIST2.$$
-file -f FILELIST2.$$ |grep text | sed -e 's/^\([^\:]*\)\:.*$/\1/' > FILELIST
+file -f FILELIST2.$$ |grep text | grep -v icon_textbox_search.gif | sed -e 's/^\([^\:]*\)\:.*$/\1/' > FILELIST
file -f FILELIST2.$$ |grep -sv text | sed -e 's/^\([^\:]*\)\:.*$/Not Modifying file: \1/'
rm FILELIST2.$$
rm FILELIST.$$