Merge branch 'Jalview-jJS/JAL-3253-applet-JAL-3436' into Jalview-JS/JAL-3253-applet
[jalview.git] / resources / .cvsignore
1 axisCommons
2 jalview_mapping.xml