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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 72d146e 45a1521)

author	Jim Procter <jprocter@issues.jalview.org>
	Thu, 25 Aug 2016 11:10:25 +0000 (12:10 +0100)
committer	Jim Procter <jprocter@issues.jalview.org>
	Thu, 25 Aug 2016 11:10:25 +0000 (12:10 +0100)
commit	d63bbc2d56c86d7dca68e76104a8682b5e38c763
tree	51c5b210219c2166be17a6c69d5ecf301191fad1	tree \| snapshot
parent	72d146eb50571b97a0f1190cbfa01d5d90428764	commit \| diff
parent	45a15211723195c363f1798dd9f0907ea6c28f08	commit \| diff

Merge branch 'develop' into bug/JAL-2154projectMappings

Conflicts:
src/jalview/gui/AlignFrame.java - propagated MessageManager tweak to jalview/gui/CrossRefAction.java

src/jalview/gui/AlignFrame.java	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/CrossRefAction.java	diff1 \|	\|	blob \| history