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

author	j.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
	Thu, 3 Jul 2014 18:27:55 +0000 (11:27 -0700)
committer	j.procter@dundee.ac.uk <jprocter@jims-mbp-2.lan>
	Thu, 3 Jul 2014 18:27:55 +0000 (11:27 -0700)
commit	b72c67c9197942b0dabfc3980e0d1d5b41813091
tree	0b95a7d766e1f8334ef99ecdfb6cd0b80a8969e4	tree \| snapshot
parent	0559035dce7173926a7f23fd5c3581c268975019	commit \| diff
parent	93d1682e83a5069aea9c1797ad8d8c2c1407b92f	commit \| diff

Merge branch 'hotfix/JAL-1530' into develop

Conflicts:
src/jalview/gui/PopupMenu.java