Peter Korsgaard fe1b2ef1d3 Merge branch 'next' ... Conflicts: Makefile package/flac/0001-fix-altivec-logic.patch package/grantlee/Config.in Signed-off-by: Peter Korsgaard <peter@korsgaard.com>		2014-12-01 11:16:42 +01:00
..
Config.in	package/network-manager: NM needs isc-dhcpc or dhcpcd	2014-11-26 16:12:22 +01:00
S45network-manager	network-manager: S45network-manager: don't use pidof -o option	2014-11-26 16:16:13 +01:00
network-manager-0001-NetworkManagerUtils-fix-build-with-toolchains-not-ex.patch	…
network-manager.mk	network-manager: adjust dhclient and dhcpcd directories	2014-11-19 23:15:58 +01:00