git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 8b27085)
Merge branch 'develop' into features/filetypeEnum
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 Aug 2016 11:56:34 +0000 (12:56 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 30 Aug 2016 11:56:34 +0000 (12:56 +0100)
Conflicts:
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FormatAdapter.java
src/jalview/io/MSFfile.java
src/jalview/io/RnamlFile.java
src/jalview/io/StockholmFile.java
src/jalview/ws/dbsources/Pdb.java
test/jalview/ext/jmol/JmolParserTest.java
test/jalview/gui/AlignViewportTest.java
test/jalview/ws/jabaws/RNAStructExportImport.java


No differences found