Merge branch 'task/JAL-3225_Integration_Gradle_building_into_Eclipse' into bug/JAL...
authorJim Procter <jprocter@issues.jalview.org>
Wed, 24 Apr 2019 19:29:32 +0000 (20:29 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 24 Apr 2019 19:51:50 +0000 (20:51 +0100)
commit1bd2350fdb5cce781548ce2e2188ab14bd412b6d
tree385cb48883199680188306653e5a5e6d4db9717a
parent11a678ebefffbce96e1373574ac912c4a7bd5785
Merge branch 'task/JAL-3225_Integration_Gradle_building_into_Eclipse' into bug/JAL-3224_getdown_changed_to_unpack_tgz_resources
28 files changed:
.classpath
.gitignore
.project
.settings/org.eclipse.buildship.core.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.core.jalview.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.core.prefs
.settings/org.eclipse.jdt.groovy.core.prefs [new file with mode: 0644]
.settings/org.eclipse.jdt.ui.prefs
build-j11.xml [deleted file]
build.gradle
doc/building.html
getdown/src/getdown/.project-MOVED [moved from getdown/src/getdown/.project with 100% similarity]
getdown/src/getdown/ant/.project-MOVED [moved from getdown/src/getdown/ant/.project with 100% similarity]
getdown/src/getdown/core/.project-MOVED [moved from getdown/src/getdown/core/.project with 100% similarity]
getdown/src/getdown/launcher/.project-MOVED [moved from getdown/src/getdown/launcher/.project with 100% similarity]
gradle.properties
j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar [moved from j11lib/Jmol-14.6.4_2016.10.26.jar with 67% similarity]
j11lib/groovy-2.5.6.jar [new file with mode: 0644]
j11lib/groovy-all-2.4.12-indy.jar [deleted file]
j11lib/groovy-console-2.5.6.jar [new file with mode: 0644]
j11lib/javax.xml.rpc-api-1.1.2.jar [new file with mode: 0644]
j11lib/jaxrpc.jar [deleted file]
j11mod/javax.xml.rpc-api-1.1.2.jar [new file with mode: 0644]
lib/Jmol-14.6.4_2016.10.26-no_netscape.jar [moved from lib/Jmol-14.6.4_2016.10.26.jar with 67% similarity]
lib/groovy-2.5.6.jar [new file with mode: 0644]
lib/groovy-all-2.4.12-indy.jar [deleted file]
lib/groovy-console-2.5.6.jar [new file with mode: 0644]
src/jalview/bin/Jalview.java