Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Feb 2015 10:59:33 +0000 (10:59 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Feb 2015 10:59:33 +0000 (10:59 +0000)
commit1004f551e9e11127a137aecdba045c1c75542b92
tree91cdcdfe7eccd23c75c73af9e634ed08189f4308
parent5b2ca3639597b44f4bd3d225c3c8522b485993a0
parent977eba6d0cdd5683a583d1ad39abf83e0c68d3ac
Merge branch 'bug/JAL-1643_File-chooser-improvement' into develop

Conflicts:
.classpath
.classpath
utils/InstallAnywhere/Jalview.iap_xml