Merge pull request #71 from LeSpocky/dev

bump to gluon v2016.1.1
FreifunkMD · Mar 3, 2016 · 9909f7a · 9909f7a
2 parents f03370c + 8f108a1
commit 9909f7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Freifunk Magdeburg Firmware
 How To Build
 ------------
 
-This is building FFMD firmware in a nutshell. For more on options or building specific branches please refer to the build script, [the official Gluon repository](https://github.com/freifunk-gluon/gluon) at GitHub, or [the official Gluon documentation](https://gluon.readthedocs.org/).
+This is building FFMD firmware in a nutshell. For more on options or building specific branches please refer to the build script, [the official Gluon repository](https://github.com/freifunk-gluon/gluon) at GitHub, or [the official Gluon documentation](http://gluon.readthedocs.org/).
 
 To compile the firmware you need a working build environment and packages for git, subversion, gawk, unzip, ncurses headers and zlib headers.
 
@@ -52,8 +52,10 @@ Verify a successful upgrade by
 
 Changelog
 ---------
+* 0.35: *gluon 2016.1.1*
+  * see http://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html
 * 0.34: *gluon 2016.1*
-  * see https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
+  * see http://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
   * firmware build script: add option -d for dirclean 
 * 0.33: *gluon 2015.1.2*
   * see http://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html

diff --git a/site.mk b/site.mk
@@ -33,7 +33,7 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	iwinfo
 
-DEFAULT_GLUON_CHECKOUT := v2016.1
+DEFAULT_GLUON_CHECKOUT := v2016.1.1
 
 # Allow overriding the checkout from the command line
 GLUON_CHECKOUT ?= $(DEFAULT_GLUON_CHECKOUT)