git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
0fcc08f
)
Merge branch 'develop' into features/JAL-2316
author
kiramt
<k.mourao@dundee.ac.uk>
Tue, 13 Dec 2016 11:10:05 +0000
(11:10 +0000)
committer
kiramt
<k.mourao@dundee.ac.uk>
Tue, 13 Dec 2016 11:10:05 +0000
(11:10 +0000)
Conflicts (resolved):
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/gui/Preferences.java
No differences found
git://source.jalview.org / jalview.git / commitdiff