diff options
| author | unknown <joreland@mysql.com> | 2005-01-04 19:12:01 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-04 19:12:01 +0100 |
| commit | 1e802e105e61f932bf9fe04829ed46e8c3d1c2d2 (patch) | |
| tree | 712247bc1974e140e23b9a5f8ec2849b2d8e6cd7 /ndb/include/Makefile.am | |
| parent | b8ddedcca689c6f0ee25ab96b3c1a5d4b482805d (diff) | |
| parent | f6dd8094f0b440ec5f8ec58590b96d6722dc47df (diff) | |
| download | mariadb-git-1e802e105e61f932bf9fe04829ed46e8c3d1c2d2.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
ndb/include/Makefile.am:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'ndb/include/Makefile.am')
| -rw-r--r-- | ndb/include/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ndb/include/Makefile.am b/ndb/include/Makefile.am index aa03ef37e3c..1b298a09e26 100644 --- a/ndb/include/Makefile.am +++ b/ndb/include/Makefile.am @@ -44,3 +44,6 @@ dist-hook: -rm -rf `find $(distdir) -type d -name SCCS` windoze-dsp: + +# Don't update the files from bitkeeper +%::SCCS/s.% |