Merge branch 'testpaches/JAL-2719_JAL-1264_testfails' into tasks/JAL-3070_wsinterfaces
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml