Commit Graph

2 Commits

Author SHA1 Message Date
c4edb13e24 Merge branch '3.1' into 3.2
Conflicts:
	wpa_supplicant/.md5sum
	wpa_supplicant/Pkgfile
2015-09-28 16:08:16 +02:00
8fab25309d wpa_supplicant: add script to start wpa_supplicant together with dhcpcd (FS#1209) 2015-09-21 11:58:17 +02:00