Merge branch 'features/JAL-845splitPaneMergeDevelop' into merge_JAL-845_JAL-1640
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml