git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c72707 03dfaa6)
Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 13 Jun 2013 16:38:37 +0000 (17:38 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Thu, 13 Jun 2013 16:38:37 +0000 (17:38 +0100)
1  2 
src/jalview/bin/Jalview.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/bin/Jalview.java
Simple merge