source.jalview.org Git - jalview.git/commit

git://source.jalview.org / jalview.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bd21900 df98ae3)

author	kiramt <k.mourao@dundee.ac.uk>
	Wed, 26 Apr 2017 13:43:35 +0000 (14:43 +0100)
committer	kiramt <k.mourao@dundee.ac.uk>
	Wed, 26 Apr 2017 13:43:35 +0000 (14:43 +0100)
commit	c55981a5c90618c23b5bedd7ff419d9cae7eef96
tree	a0e01ff947d433eaa28f11efb8889a459c76a733	tree \| snapshot
parent	bd2190024b6988cc7a371e932ef5c46de0d9df3b	commit \| diff
parent	df98ae3e601ff44c9a1d7beb5c9014aebf0e960e	commit \| diff

Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into features/JAL-2388OverviewWindow

test/jalview/io/JSONFileTest.java