Merge branch 'develop' into bug/JAL-2154projectMappings
authorJim Procter <jprocter@issues.jalview.org>
Tue, 23 Aug 2016 10:17:42 +0000 (11:17 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 23 Aug 2016 10:17:42 +0000 (11:17 +0100)
commit72d146eb50571b97a0f1190cbfa01d5d90428764
treef34c98e1e90c11588e0ab52e0d393db2d041ca00
parent6f9b0cd13d25cf041aed033652e87f2d547cba52
parent585a6abef0a5beef8b5247d9b44105dbf389ba45
Merge branch 'develop' into bug/JAL-2154projectMappings

Conflicts:
 src/jalview/gui/AlignFrame.java
  - pushed raise warning dialog to CrossRefAction
 test/jalview/analysis/AlignmentUtilsTests.java
  - simple merge
 test/jalview/io/Jalview2xmlTests.java
  - pushed updated BeforeClass setup to Jalview2xmlBase
src/jalview/gui/CrossRefAction.java
test/jalview/io/Jalview2xmlBase.java
test/jalview/io/Jalview2xmlTests.java