git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21fccb3 6296524)
Merge branch 'develop' into features/JAL-892varnaToProject
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 14:50:57 +0000 (15:50 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 14:50:57 +0000 (15:50 +0100)
1  2 
.classpath patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java patch | diff1 | diff2 | blob | history

diff --cc .classpath
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge