Merge branch 'mysql-5.5' into mysql-5.6

Conflicts: support-files/build-tags
awesomeleo · Nov 12, 2014 · 29386b0 · 29386b0
2 parents 2e29f76 + dd4f852
commit 29386b0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/support-files/build-tags b/support-files/build-tags
@@ -1,10 +1,10 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$'
 
 list="find . -type f"
-bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
+git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
 $list |grep $filter |while read f; 
 do