git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2feac6d 242fe71)
Merge remote-tracking branch 'origin/develop' into
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 19 Apr 2017 11:01:30 +0000 (12:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 19 Apr 2017 11:01:30 +0000 (12:01 +0100)
features/JAL-2388OverviewWindow

Conflicts:
resources/lang/Messages_es.properties

1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge