Susan LoVerso e451621025 Merge branch 'develop' into transaction-background ...

Conflicts:
	src/include/config.h
	src/include/txn.h
	src/include/wiredtiger.in

2015-05-13 15:45:52 -04:00

..

src/com/wiredtiger/db

Merge branch 'develop' into java-examples

2015-01-09 10:19:17 -05:00

java_doc.i

Merge branch 'develop' into transaction-background

2015-05-13 15:45:52 -04:00

Makefile.am

Added -I include paths as needed to handle #include <3rdparty/...>

2015-03-25 20:21:32 -04:00

wiredtiger.i

Add WT_CONNECTION::add_encryptor() to satisfy unused function warning.

2015-03-26 14:06:31 -04:00