git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f9c855 dfc6f65)
Merge branch 'develop' into feature_29/JAL-1372_referenceseq
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 21 Jan 2015 15:04:37 +0000 (15:04 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 21 Jan 2015 15:04:37 +0000 (15:04 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge