diff options
author | Michael Widenius <monty@askmonty.org> | 2009-10-14 11:09:56 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2009-10-14 11:09:56 +0300 |
commit | 8e1a29a40eaa3daaa0e68dbe540028dc63fdfe6b (patch) | |
tree | fc434ac8f8707ed8bf569798a7f58a2f8cf331a5 /storage/pbxt | |
parent | 90e2f1d24fb20d7d6799a09568fd80cfb8ba8f5d (diff) | |
parent | e3c7a1085266087d47fe96896298ed7595148342 (diff) | |
download | mariadb-git-8e1a29a40eaa3daaa0e68dbe540028dc63fdfe6b.tar.gz |
Automatic merge with 5.1-merge
Diffstat (limited to 'storage/pbxt')
-rw-r--r-- | storage/pbxt/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/pbxt/src/Makefile.am b/storage/pbxt/src/Makefile.am index 94cf6517329..a09d8f0a57b 100644 --- a/storage/pbxt/src/Makefile.am +++ b/storage/pbxt/src/Makefile.am @@ -49,4 +49,4 @@ libpbxt_a_SOURCES = $(libpbxt_la_SOURCES) libpbxt_a_CXXFLAGS = $(AM_CXXFLAGS) libpbxt_a_CFLAGS = $(AM_CFLAGS) -std=c99 -EXTRA_DIST = pbms_enabled.cc +EXTRA_DIST = pbms_enabled.cc win_inttypes.h |