Merge branch 'bug/JAL-1486_flatfile' into Release_2_8_2_Branch
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml