krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Switch to upstream gluon master

Browse Source
This commit is contained in:
Franz Pletz
2016-08-05 16:43:07 +02:00
parent 010e61b9ea
commit 3fb12769ca
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Freifunk München Firmware Changelog # Freifunk München Firmware Changelog
## v2016.1
UNRELEASED
## v2016.0 ## v2016.0
- Updated to Gluon v2016.1.5 (ffmuc fork) - Updated to Gluon v2016.1.5 (ffmuc fork)
- Changes: - Changes:

4
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := dddade25de0c20207385c339d66d3ac7b8092136 GLUON_GIT_REF := d445cb772d2a7f4f0bfb31a6aa1751a285ea2493
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key