Merge branch 'master' of https://github.com/FreifunkBremen/gluon into FreifunkBremen-master

Conflicts:
	docs/user/getting_started.rst
This commit is contained in:
Nils Schneider 2014-10-13 12:24:51 +02:00
commit e4c93d5c9b

View File

@ -118,6 +118,6 @@ $(eval $(call GluonModel,WRT160NL,wrt160nl-squashfs,linksys-wrt160nl))
$(eval $(call GluonProfile,WZRHPG450H)) $(eval $(call GluonProfile,WZRHPG450H))
$(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h-squashfs,buffalo-wzr-hp-g450h)) $(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h-squashfs,buffalo-wzr-hp-g450h))
# WZR-HP-AG300H # WZR-HP-AG300H/WZR-600DHP
$(eval $(call GluonProfile,WZRHPAG300H)) $(eval $(call GluonProfile,WZRHPAG300H))
$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h)) $(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h-wzr-600dhp))