Merge branch 'JAL-1139_proguard' into Release_2_8_1_Branch
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:36:26 +0000 (18:36 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:36:26 +0000 (18:36 +0000)
commit488810eccac060404d068ce303cd31aa6ad525ae
tree5237aea62bd62e025004c128f16f3f042b756657
parentebe550d1be047dd5d9fd75883fa8df4973d6b6a4
parente1476d3c4ebb1c8f6b3ec7d46bb824b23987960e
Merge branch 'JAL-1139_proguard' into Release_2_8_1_Branch

Conflicts:
lib/Jmol-12.2.4.jar
build.xml