git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3357e1 8988e50)
Merge branch 'task/JAL-3254_improved_max_memory_stack_setting' into task/JAL-3247_JAL...
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 20 May 2019 22:03:23 +0000 (23:03 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 20 May 2019 22:03:23 +0000 (23:03 +0100)
Merging a number of fixes/improvements into one branch and then merge in develop

1  2 
gradle.properties patch | diff1 | diff2 | blob | history

diff --cc gradle.properties
Simple merge