Merge branch 'JAL-1139_proguard' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:38:25 +0000 (18:38 +0000)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Mon, 25 Nov 2013 18:38:25 +0000 (18:38 +0000)
commit6fb502e4a8749d1d98f5442c3b8156ab47996b77
tree60ef8546fb72e58df604b742d7d1bbd26cb2c3bd
parent0e7bd4678ca20b83e3c7d65a96fc6866374e6575
parente1476d3c4ebb1c8f6b3ec7d46bb824b23987960e
Merge branch 'JAL-1139_proguard' into develop

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