Merge branch 'develop' into JAL-1705_trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Jan 2016 12:07:40 +0000 (12:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 28 Jan 2016 12:07:40 +0000 (12:07 +0000)
commita6b324e3f5edac3df0b968f0037b1cc8b651598e
tree94c597d149601653dabfe8a385a12b48203c0896
parente0401a6563eb1fb58b2f4b6d594b4b3826135950
parent5b079109d33a4596a8c3017dbf93b7de5b0300c5
Merge branch 'develop' into JAL-1705_trialMerge

Conflicts:
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/CrossRef.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/ws/dbsources/Uniprot.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/util/MappingUtilsTest.java
test/jalview/ws/seqfetcher/DbRefFetcherTest.java
23 files changed:
resources/lang/Messages.properties
src/jalview/analysis/AlignmentUtils.java
src/jalview/analysis/CrossRef.java
src/jalview/analysis/Dna.java
src/jalview/analysis/SequenceIdMatcher.java
src/jalview/appletgui/AlignFrame.java
src/jalview/controller/AlignViewController.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SequenceFetcher.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/util/MappingUtils.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/dbsources/Pdb.java
src/jalview/ws/dbsources/Uniprot.java
src/jalview/ws/seqfetcher/ASequenceFetcher.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/datamodel/SequenceTest.java
test/jalview/util/DBRefUtilsTest.java
test/jalview/util/MappingUtilsTest.java
test/jalview/ws/seqfetcher/DbRefFetcherTest.java