git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c17363 071b0e9)
Merge branch 'jims_marckhacks' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 16:42:05 +0000 (17:42 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 16:42:05 +0000 (17:42 +0100)
1  2 
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GAlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/schemes/ResidueProperties.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge
diff --cc src/jalview/jbgui/GAlignFrame.java
Simple merge