git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8546ee2 21be536)
Merge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties task/JAL-2196pdbeProperties
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)
1  2 
src/jalview/appletgui/AppletJmol.java patch | diff1 | diff2 | blob | history
src/jalview/gui/Jalview2XML.java patch | diff1 | diff2 | blob | history
src/jalview/structures/models/AAStructureBindingModel.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AppletJmol.java
Simple merge
diff --cc src/jalview/gui/Jalview2XML.java
Simple merge