Michael Cahill 1dae9366fd Merge branch 'develop' into cursor-equal ...

Conflicts:
	src/cursor/cur_std.c
	src/cursor/cur_table.c
	src/include/extern.h

2015-01-17 07:48:42 +11: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 cursor-equal

2015-01-17 07:48:42 +11:00

Makefile.am

Added a minimal ExceptionTest for java.

2014-10-23 11:19:36 -04:00

wiredtiger.i

Merge branch 'develop' into cursor-equal

2015-01-17 07:33:37 +11:00