Merge branch 'master' of github.com:basho-labs/wterl

Conflicts: c_src/wiredtiger-build.patch
2013-04-26 10:37:06 -04:00 · 2013-04-26 10:37:06 -04:00 · bfc180eeb3
commit bfc180eeb3
parent f1cb6f8c61 3a51afcc20
1 changed files with 1 additions and 1 deletions
--- a/c_src/wiredtiger-build.patch
+++ b/c_src/wiredtiger-build.patch
@ -3,7 +3,7 @@ index 6d78823..2122cf8 100644
 --- a/ext/compressors/snappy/Makefile.am
 +++ b/ext/compressors/snappy/Makefile.am
@@ -2,5 +2,6 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/src/include
-
+ 
 lib_LTLIBRARIES = libwiredtiger_snappy.la
 libwiredtiger_snappy_la_SOURCES = snappy_compress.c
 -libwiredtiger_snappy_la_LDFLAGS = -avoid-version -module