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