aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-06 02:20:11 +0100
committerNils Adermann <naderman@naderman.de>2010-03-06 02:29:04 +0100
commit568fb83373361abb8c9f3886fee944a8d9e5f66d (patch)
tree602256c8abb312f50e2776187e1e2ce02e52a5ea /phpBB/develop
parent5d1d32a65bced82f068dbed497cc418eae5f4701 (diff)
parentc4e02a191628b4b9f7b6340f2876607663baeb5a (diff)
downloadforums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.gz
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.bz2
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.tar.xz
forums-568fb83373361abb8c9f3886fee944a8d9e5f66d.zip
Merge branch 'master' into develop-olympus
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.$$