Merge branch 'develop' into features/JAL-1759jmolUpdate
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 13:37:19 +0000 (14:37 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 13:37:19 +0000 (14:37 +0100)
commitc9df5bd6e95c23c9b560c0a59003d1f4043f8055
tree457efd494f4244238d68c0892d7c4515edb2a9da
parentf59ae49cdd2bb8f6721424ea6ce167e8245e7d15
parent6296524c4ccada42516aac9a85398170f5a3bc5d
Merge branch 'develop' into features/JAL-1759jmolUpdate

Conflicts:
.classpath
src/jalview/appletgui/AlignFrame.java
test/jalview/io/NewickFileTests.java
40 files changed:
.classpath
build.xml
src/jalview/appletgui/AlignFrame.java
src/jalview/binding/Alignment.java
src/jalview/binding/Annotation.java
src/jalview/binding/AnnotationElement.java
src/jalview/binding/Colour.java
src/jalview/binding/Feature.java
src/jalview/binding/FeatureSettings.java
src/jalview/binding/Features.java
src/jalview/binding/JGroup.java
src/jalview/binding/JSeq.java
src/jalview/binding/JalviewModel.java
src/jalview/binding/JalviewModelSequence.java
src/jalview/binding/JalviewUserColours.java
src/jalview/binding/Pdbentry.java
src/jalview/binding/PdbentryItem.java
src/jalview/binding/Pdbids.java
src/jalview/binding/Property.java
src/jalview/binding/Sequence.java
src/jalview/binding/SequenceSet.java
src/jalview/binding/SequenceType.java
src/jalview/binding/Setting.java
src/jalview/binding/Tree.java
src/jalview/binding/UserColourScheme.java
src/jalview/binding/UserColours.java
src/jalview/binding/VAMSAS.java
src/jalview/binding/VamsasModel.java
src/jalview/binding/Viewport.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AppJmol.java
src/jalview/gui/PopupMenu.java
src/jalview/schemabinding/version2/.castor.cdr
src/jalview/schemabinding/version2/CalcIdParam.java
src/jalview/schemabinding/version2/JGroup.java
src/jalview/schemabinding/version2/Setting.java
src/jalview/schemabinding/version2/StructureState.java
src/jalview/schemabinding/version2/Tree.java
src/jalview/schemabinding/version2/Viewport.java