git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 318e3ba a9b2a4d)
Merge branch 'develop' into bug/JAL-1803_JAL-2157
authorJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 11:46:28 +0000 (12:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 7 Sep 2016 11:46:28 +0000 (12:46 +0100)
1  2 
src/jalview/ext/jmol/JmolParser.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/ext/jmol/JmolParser.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge