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

..

wiredtiger

Update copyright notices for 2014.

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

Makefile.am

Fix include paths for Java and Python builds.

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

run-ex_access

Fixes for automake 1.3.x: don't use $(srcdir) in TESTS and avoid the new parallel test harness (our tests all currently expect to have exclusive access to a WT_TEST directory).

2013-01-07 17:43:44 +11:00

setup.py

Update copyright notices for 2014.

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

wiredtiger.i

Merge branch 'develop' into async

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