git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8af5dc2 ef27f54)
Merge branch 'JAL-1199-Stk_writing' into rnaml_test
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 14 Feb 2013 18:51:13 +0000 (18:51 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 14 Feb 2013 18:51:13 +0000 (18:51 +0000)
commitbb99cb8aa479dc7dd30b3678f183044247e25998
tree6d1d4e104236a8f124670553db34f29369879084tree | snapshot
parent8af5dc25549fb2ba801ae889d44744a46dacf04ecommit | diff
parentef27f54c5b57246405fb34109f40c501f6ba8e0dcommit | diff
Merge branch 'JAL-1199-Stk_writing' into rnaml_test

Conflicts:
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/StockholmFile.java
Merged in Natasha's writer and enhanced parser and relocated VARNA based parser to unused function. This version will *not* cope with pseudoknots
src/jalview/io/AppletFormatAdapter.java diff1 | diff2 | blob | history
src/jalview/io/StockholmFile.java diff1 | diff2 | blob | history