set to own gluon branch + update ffhb-packages (remove not tested mesh-segmentation)

This commit is contained in:
Martin/Geno 2019-06-28 18:28:37 +02:00
parent 5c54cb5acc
commit 1f96da47fb
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
3 changed files with 3 additions and 3 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "gluon"] [submodule "gluon"]
path = gluon path = gluon
url = https://github.com/christf/gluon.git url = https://github.com/FreifunkBremen/gluon.git

2
gluon

@ -1 +1 @@
Subproject commit 4cbe63ffbbe68e92e76fd95b293a8a8670ae0883 Subproject commit 37fb7a1ede0ffc3119e15399c517f84e3c3d9ea7

View File

@ -10,7 +10,7 @@ PACKAGES_GLUON_BRANCH=genofire-clientcount
PACKAGES_GLUON_COMMIT=a559097e8c138e7ffa45696446be34f8acf83b85 PACKAGES_GLUON_COMMIT=a559097e8c138e7ffa45696446be34f8acf83b85
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=632dcc2a57838700ddce880571f7134b15d0dffc PACKAGES_FFHB_COMMIT=8532bb587afbadb2e95d3677b8ce92e704cbe713
PACKAGES_FFHB_BRANCH=events PACKAGES_FFHB_BRANCH=events
PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git