Merge branch 'JAL-1517_release282' into develop
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml