summaryrefslogtreecommitdiff
path: root/server-tools
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2010-11-30 23:11:03 +0200
committerMichael Widenius <monty@mysql.com>2010-11-30 23:11:03 +0200
commit1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a (patch)
treea0c58838a4dd7bdf2ed4d739563da27727ada7b0 /server-tools
parentb2e979d868d5d5964d58c97ed9580e07f6123217 (diff)
parent6f279f40145624c1ffab06c63521f96ce4ac3a02 (diff)
downloadmariadb-git-1e5061fe3be981d6f685a2865fd1e2bcd3fcc23a.tar.gz
merge with 5.1
Diffstat (limited to 'server-tools')
-rw-r--r--server-tools/instance-manager/Makefile.am3
1 files changed, 0 insertions, 3 deletions
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 5c5af3377eb..dce7c77232d 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -99,6 +99,3 @@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \
tags:
ctags -R *.h *.cc
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%