git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0ed5b94 b4be313)
Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:07:49 +0000 (16:07 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 16:07:49 +0000 (16:07 +0000)
1  2 
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
src/jalview/ws/sifts/SiftsClient.java patch | diff1 | diff2 | blob | history

diff --cc resources/lang/Messages.properties
Simple merge
diff --cc src/jalview/ws/sifts/SiftsClient.java
Simple merge