git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f25f512 cd06f45)
Merge remote-tracking branch 'origin/bug/JAL-2282' into develop
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 2 Nov 2016 16:19:54 +0000 (16:19 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 2 Nov 2016 16:19:54 +0000 (16:19 +0000)
1  2 
src/jalview/appletgui/APopupMenu.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/APopupMenu.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge