Michael Cahill 5cba38f382 Merge branch 'develop' into async ...

Conflicts:
	src/include/extern.h
	src/include/wiredtiger.in

2014-04-07 15:39:23 +10:00

..

src/com/wiredtiger/db

Update copyright notices for 2014.

2014-01-07 10:30:12 -05:00

java_doc.i

Clean up pass for s_all.

2014-03-26 11:42:29 -04:00

Makefile.am

Fix include paths for Java and Python builds.

2014-03-31 13:03:53 +11:00

wiredtiger.i

Fix include paths for Java and Python builds.

2014-03-31 13:03:53 +11:00