git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd21900 df98ae3)
Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into...
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:43:35 +0000 (14:43 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:43:35 +0000 (14:43 +0100)
1  2 
test/jalview/io/JSONFileTest.java patch | diff1 | diff2 | blob | history

diff --cc test/jalview/io/JSONFileTest.java
Simple merge