summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2013-06-10 21:29:46 +0200
committermakefu <github@syntax-fehler.de>2013-06-10 21:29:46 +0200
commit1707fdd4035c776292527e1ae26a7692833ee5ed (patch)
tree63fdb5f2a49633d578de539a81723ca47e7d626b
parentc41e98ca670dc40ac9550762f07c91bc4819d790 (diff)
parent8d6862c95a09fa01400f8fc15ceeeaf9d36fd875 (diff)
Merge branch 'master' of github.com:krebscode/autowifi
Conflicts: TODO etc/autowifi/wifi_keys
-rw-r--r--TODO4
-rw-r--r--etc/autowifi/wifi_keys2
2 files changed, 3 insertions, 3 deletions
diff --git a/TODO b/TODO
index cc14f041..42e9679c 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
-sort networks by bandwidth and connect
-perform initial scan on startup of unscanned networks
more intelligent autoconnect (open first, encrypted second etc.)
+ perform initial scan on startup of unscanned networks
+ sort networks by bandwidth and connect
profiles ala netcfg/netctl
better profile hooks
diff --git a/etc/autowifi/wifi_keys b/etc/autowifi/wifi_keys
index 6d4e6b55..ef66cf3e 100644
--- a/etc/autowifi/wifi_keys
+++ b/etc/autowifi/wifi_keys
@@ -1 +1 @@
-#SSID|MAC|KEY
+#SSID|MAC|BANDWIDTH|KEY