summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-08-18 13:09:26 +0300
committerunknown <monty@donna.mysql.com>2000-08-18 13:09:26 +0300
commitd000fde588c33896739320df947ccf8cbad4b981 (patch)
treeb47f92fa5b8b69587ec57938ff7a9b322fec6d57 /strings
parent340794dd2991246daf964e95067309c3183aa86a (diff)
parentf053a2846ae1479cfe0ca3efd0bb8bddc410f84b (diff)
downloadmariadb-git-d000fde588c33896739320df947ccf8cbad4b981.tar.gz
Merge
myisammrg/Makefile.am: Auto merged support-files/Makefile.am: Auto merged sql/ha_myisam.cc: Merge against serg's changes BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'strings')
-rw-r--r--strings/Makefile.am3
1 files changed, 3 insertions, 0 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am
index fc305e340a4..fac662b8789 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -85,3 +85,6 @@ if ASSEMBLER
%.o : %.s
$(AS) -o $@ $<
endif
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%