Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml