Merge branch 'develop' into dev_from_2_8_1
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 14 Oct 2013 16:26:20 +0000 (17:26 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 14 Oct 2013 16:26:20 +0000 (17:26 +0100)
commita9315b41e948f66f4632f7d419fda643bc0b9354
tree0b6520001a3b6c0fa7a214783f460b5da9f91cf9
parentfd103a630efc6d0f7abb0e4f9f5f8038b54f51aa
parent60f7107d9fc77f34e96ae4b9780e2d11195aed3b
Merge branch 'develop' into dev_from_2_8_1

Conflicts:
.classpath
.project
src/jalview/appletgui/AlignFrame.java
src/jalview/io/FileLoader.java
13 files changed:
.classpath
build.xml
src/MCview/PDBViewer.java
src/jalview/appletgui/AlignFrame.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/AppVarnaBinding.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/Desktop.java
src/jalview/gui/PopupMenu.java
src/jalview/io/FileLoader.java
src/jalview/jbgui/GAlignFrame.java
utils/InstallAnywhere/Jalview.iap_xml