diff options
author | istruewing@chilla.local <> | 2007-01-03 08:52:50 +0100 |
---|---|---|
committer | istruewing@chilla.local <> | 2007-01-03 08:52:50 +0100 |
commit | d37ff7d7bc309d9fd713281920df21f27adece38 (patch) | |
tree | ea90140f6a6294213c207d5029e87254a2a9434e /Makefile.am | |
parent | bcbb50c1d2c1a04b57c012f8efadfeba9d789a15 (diff) | |
parent | 499eb4d8bae79220ff461fccc05e25e15629ec88 (diff) | |
download | mariadb-git-d37ff7d7bc309d9fd713281920df21f27adece38.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 53fac803498..7adf8c293c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2006 MySQL AB # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -136,3 +136,5 @@ test-force-mem: #used by autopush.pl to run memory based tests +# Don't update the files from bitkeeper +%::SCCS/s.% |