Commit bc2ccef3 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

Merge tag '3.3' into develop

TextGridLab 3.3
parents 8d7420c5 5868dc5a
[submodule "textgridlab-dependencies"]
path = textgridlab-dependencies
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/textgridlab-dependencies.git
branch = develop
branch = master
[submodule "core"]
path = core
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/lab-core.git
branch = develop
branch = master
[submodule "base"]
path = base
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/lab-base.git
branch = develop
branch = master
[submodule "xmleditor"]
path = xmleditor
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/xmleditor.git
branch = develop
branch = master
[submodule "help"]
path = help
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/help.git
branch = develop
branch = master
[submodule "linkeditor"]
path = linkeditor
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/linkeditor.git
branch = develop
branch = master
[submodule "dictionaries"]
path = dictionaries
url = git://git.projects.gwdg.de/dariah-de/tg/textgrid-laboratory/dictionaries.git
branch = develop
branch = master
[submodule "bundled-jre"]
path = bundled-jre
url = https://github.com/DARIAH-DE/bundled-jre
branch = master
base @ b68ad0f0
Subproject commit 3fdf1ca379bc4e4ef11f484b4372b874fdf41d7c
Subproject commit b68ad0f0cb87c5a24ba12f1a05f832a67ff25dd8
Subproject commit 09ebbd2f5d53471a0744418eb4602a71ce45c661
Subproject commit 6516886a2101e424f273a4522bd521160d1fa285
core @ d42fa066
Subproject commit 7f03a363d036807393c4f1e36ab9c568d58c3f5c
Subproject commit d42fa06618e63fd86ea7563f586c37feb46bc8a0
dictionaries @ 0386c7ab
Subproject commit 79f379f96d0c17da297a27a729d4314bfba2ba83
Subproject commit 0386c7ab5e9cb797eb877395d5ff5424ea231d88
help @ ea457603
Subproject commit 4678ecb53619fa6cad3274eadee68a061104c80d
Subproject commit ea457603941a6f5fa5bd1afa6a034310f9a0ee64
linkeditor @ 8af4cd63
Subproject commit 191a216a68487a901124ffe7a6bf8a7353c1402b
Subproject commit 8af4cd63ee52cf63e44e02bb52e46f71b60591c8
......@@ -14,8 +14,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
<lab.repository.eclipse>http://download.eclipse.org/releases/luna</lab.repository.eclipse>
<lab.repository.dependencies>https://ci.de.dariah.eu/p2/nightly/dependencies</lab.repository.dependencies>
<lab.repository.root>https://ci.de.dariah.eu/p2/nightly</lab.repository.root>
<lab.repository.dependencies>https://ci.de.dariah.eu/p2/prerelease/dependencies</lab.repository.dependencies>
<lab.repository.root>https://ci.de.dariah.eu/p2/prerelease</lab.repository.root>
<lab.repository.core>${lab.repository.root}/core</lab.repository.core>
<lab.repository.xmleditor>${lab.repository.root}/xmleditor</lab.repository.xmleditor>
<lab.repository.help>${lab.repository.root}/help</lab.repository.help>
......
Subproject commit 1b748f7377e614c3c3353137e20da49d308ef445
Subproject commit 971d1a039a54d788cc42c78efffa890a2503eea0
xmleditor @ 1eb77378
Subproject commit 01c7e1119748f3721384cbb9fc43d22dad88bc58
Subproject commit 1eb773781803c7363936977e42698b1467820217
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment