source.jalview.org Git - jalview.git/commit - src/jalview/io/JalviewFileChooser.java

author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Mon, 10 Dec 2018 13:55:12 +0000 (13:55 +0000)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Mon, 10 Dec 2018 13:55:12 +0000 (13:55 +0000)
commit	903973eeb7485c38e32002d926de1e06bf29bc94
tree	bb9d7b40ffb2887e6998241efe09274d8018d411	tree \| snapshot
parent	a4aa14220a6a53391ca8e171bc774cef908057a3	commit \| diff
parent	d7527de9d963ee1869b0c7545be3d9213cdd0c6d	commit \| diff

Merge branch 'feature/JAL-3169cancelOverwrite' into
JAL-3048dialogRunner2

Conflicts:
src/jalview/io/JalviewFileChooser.java