summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorholyfoot/hf@hfmain.(none) <>2007-11-12 13:07:30 +0400
committerholyfoot/hf@hfmain.(none) <>2007-11-12 13:07:30 +0400
commit8240a3e8683543b5971b3eff1a76dace302536a2 (patch)
treedf82262f59b9dab7d9f3ad0f863b13662f83d132 /.bzrignore
parent97e0180b2bf3f1c92d3a6ef03d5910774360482d (diff)
parent83a2781894a70f1686d333f8ff1a7ef767b9fce8 (diff)
downloadmariadb-git-8240a3e8683543b5971b3eff1a76dace302536a2.tar.gz
Merge mysql.com:/home/hf/work/31305/my50-31305
into mysql.com:/home/hf/work/31305/my51-31305
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index e1ad5a89015..7a8066fdba1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -900,6 +900,7 @@ libmysql_r/.libs/libmysqlclient_r.lai
libmysql_r/.libs/libmysqlclient_r.so.15
libmysql_r/.libs/libmysqlclient_r.so.15.0.0
libmysql_r/acconfig.h
+libmysql_r/client_settings.h
libmysql_r/conf_to_src
libmysql_r/my_static.h
libmysql_r/mysys_priv.h