Merge branch 'feature/JAL-2613' into feature/JAL-2611
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml