git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0935f3c
f1258e0
)
Merge branch 'develop' into features/JAL-2316
features/JAL-2316
author
Jim Procter
<jprocter@issues.jalview.org>
Thu, 9 Feb 2017 11:50:07 +0000
(11:50 +0000)
committer
Jim Procter
<jprocter@issues.jalview.org>
Thu, 9 Feb 2017 11:50:07 +0000
(11:50 +0000)
1
2
resources/lang/Messages.properties
patch
|
diff1
|
diff2
|
blob
|
history
resources/lang/Messages_es.properties
patch
|
diff1
|
diff2
|
blob
|
history
src/jalview/appletgui/APopupMenu.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
resources/lang/Messages.properties
Simple merge
diff --cc
resources/lang/Messages_es.properties
Simple merge
diff --cc
src/jalview/appletgui/APopupMenu.java
Simple merge