John Brownlee 9cad7c8a72 Merge remote-tracking branch 'upstream/release-5.2' into release-6.0-5.2-merge ... # Conflicts: # documentation/sphinx/source/downloads.rst # documentation/sphinx/source/release-notes.rst # packaging/msi/FDBInstaller.wxs # versions.target		2018-07-31 13:17:37 -07:00
..
src	Merge remote-tracking branch 'upstream/release-5.2' into release-6.0-5.2-merge	2018-07-31 13:17:37 -07:00
fdb-java-style.xml	spaces to tabs	2018-04-09 19:03:47 -07:00
fdbJNI.cpp	bump API version from 520 to 600	2018-07-09 11:00:57 -07:00
fdb_java.vcxproj	Changed the TLS_DISABLED macro	2018-06-26 12:08:32 -07:00
local.mk	Fix spacing in build file	2018-05-23 15:01:13 -07:00
pom.xml.in	Modified the groupId to org.foundationdb	2018-05-17 12:53:57 -07:00
suppressions.xml	added a style guide ; fixed errors found from the style guide ; updated tests to use java 8 closures	2017-12-13 16:16:31 -08:00