Merge branch 'JAL-1286' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:54:20 +0000 (13:54 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 7 Nov 2013 13:54:20 +0000 (13:54 +0000)
commit93762210516927cf4eafff52af32d1d90d499f28
treef8e49fee994dffc215ce2c8aed0a526f42c5aaa7
parent3dbf0189b661a25879de7fbac1f34c049f026d83
parent9809e9cda7fea9968e6e50696b215a591f6172d3
Merge branch 'JAL-1286' into Release_2_8_1_Branch
slightly dirty merge - JAL-1400 patches have been brought in too
Conflicts:
build.xml
build.xml
utils/InstallAnywhere/Jalview.iap_xml