Merge branch 'develop' into Release_2_9_Branch
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000 (11:53 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 19 Aug 2015 10:53:18 +0000 (11:53 +0100)
commit6e40e369dd36223d0efa9344ad1a491dd63e2463
tree9f0a9d41507185a7f86d61ed1a832e8837bb20a0
parent5d55f07e1f6932c056ae2390cf60b3789dce3219
parent665ed04ba87a0024e6459ab41cdb7261a4087e19
Merge branch 'develop' into Release_2_9_Branch

Conflicts:
TESTNG (now added to .gitignore)
test/jalview/ws/jabaws/RNAStructExportImport.java