merge

2009-05-30 17:37:38 +01:00
parent 5839b484bb ddb42cdc0d
commit 3cc72e4626
148 changed files with 7813 additions and 4822 deletions
--- a/src/wscript
+++ b/src/wscript
@@ -54,6 +54,7 @@ def configure(conf):
    conf.sub_config('core')
    conf.sub_config('simulator')
    conf.sub_config('devices/emu')
+    conf.sub_config('devices/wifi')
    conf.sub_config('devices/tap-bridge')
    conf.sub_config('contrib')
    conf.sub_config('internet-stack')