josecoll bc56a60d4a Final renaming of invalid constants in Integration tests following rebase from OS master.		2017-12-13 13:10:04 +00:00
..
integration-test/kotlin/net/corda/client/jfx	Final renaming of invalid constants in Integration tests following rebase from OS master.	2017-12-13 13:10:04 +00:00
main/kotlin/net/corda/client/jfx	Merge branch 'master' of https://github.com/corda/corda into christians_os_merge_20171106	2017-11-06 17:27:13 +00:00
test/kotlin/net/corda/client/jfx	Perform sensible currency conversion (#1941)	2017-10-25 19:25:19 +01:00