Merge branch 'JAL-1286' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:56:07 +0000 (13:56 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:56:07 +0000 (13:56 +0000)
commitab271f65ad7519b988efbfa04e32a0199d9bd8d4
treeed8a749d962cbb9e6b4d83fa9ef04ab0badb2208
parent3345cab7f816b4871c65d704e29daf0b6bcad638
parent9809e9cda7fea9968e6e50696b215a591f6172d3
Merge branch 'JAL-1286' into develop
slightly dirty merge - JAL-1400 patches brought in too
Conflicts:
build.xml
build.xml
utils/InstallAnywhere/Jalview.iap_xml