Conflicts:
	site.mk
This commit is contained in:
ohrensessel 2014-07-29 16:33:49 +02:00
commit 0f42d9c78f

View file

@ -1,6 +1,7 @@
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
gluon-alfred \ gluon-alfred \
gluon-ath9k-workaround \ gluon-ath9k-workaround \
gluon-announced \
gluon-autoupdater \ gluon-autoupdater \
gluon-config-mode-ffhh \ gluon-config-mode-ffhh \
gluon-ebtables-filter-multicast \ gluon-ebtables-filter-multicast \
@ -8,6 +9,7 @@ GLUON_SITE_PACKAGES := \
gluon-legacy \ gluon-legacy \
gluon-luci-admin \ gluon-luci-admin \
gluon-luci-autoupdater \ gluon-luci-autoupdater \
gluon-luci-portconfig \
gluon-next-node \ gluon-next-node \
gluon-mesh-batman-adv \ gluon-mesh-batman-adv \
gluon-mesh-vpn-fastd \ gluon-mesh-vpn-fastd \