git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d0d60b4 82cba0a)
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 25 Jan 2018 18:57:58 +0000 (18:57 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 25 Jan 2018 18:57:58 +0000 (18:57 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/fts/core/GFTSPanel.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/fts/core/GFTSPanel.java
Simple merge