git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d63bbc2)
Merge branch 'develop' into bug/JAL-2154projectMappings
authorJim Procter <jprocter@issues.jalview.org>
Thu, 25 Aug 2016 11:10:25 +0000 (12:10 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Thu, 25 Aug 2016 11:10:25 +0000 (12:10 +0100)
 Conflicts:
src/jalview/gui/AlignFrame.java - propagated MessageManager tweak to jalview/gui/CrossRefAction.java


No differences found