diff options
| author | unknown <kaa@polly.(none)> | 2007-11-22 14:39:07 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-11-22 14:39:07 +0300 |
| commit | 0515b1402032b82d99d7bf1a0a90241e69d645a5 (patch) | |
| tree | b9070d1d88813c45dbb89dca5a044e154980cc64 /libmysql/Makefile.am | |
| parent | 0280133ac034637bcff34a5118f4cb2a6ec4742a (diff) | |
| parent | c4d0901d00bdeb496aeffedc80e6d583711086d3 (diff) | |
| download | mariadb-git-0515b1402032b82d99d7bf1a0a90241e69d645a5.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug32221/my50-bug31445
into polly.(none):/home/kaa/src/opt/bug32221/my51-bug31445
BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952:
Auto merged
BitKeeper/deleted/.del-mytest.c~9a99338689e5de8:
Auto merged
BitKeeper/deleted/.del-mytest.dsw~2324698861155335:
Auto merged
libmysql/Makefile.am:
Auto merged
tests/bug25714.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
Auto merged
BitKeeper/deleted/.del-mytest_1.c:
Merge rename: BitKeeper/deleted/.del-mytest.c -> BitKeeper/deleted/.del-mytest_1.c
BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9:
Auto merged
BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6:
Auto merged
libmysql/CMakeLists.txt:
Manual merge.
Diffstat (limited to 'libmysql/Makefile.am')
| -rw-r--r-- | libmysql/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index e5005553467..21f8f372d0f 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -31,7 +31,7 @@ include $(srcdir)/Makefile.shared libmysqlclient_la_SOURCES = $(target_sources) libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_las) libmysqlclient_la_LDFLAGS = $(target_ldflags) -EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c CMakeLists.txt +EXTRA_DIST = Makefile.shared libmysql.def dll.c CMakeLists.txt noinst_HEADERS = client_settings.h link_sources: |