merge with HEAD

2007-10-16 14:44:36 +02:00
parent 54725d30b1 61ed256846
commit 83e7cf54f4
55 changed files with 5906 additions and 349 deletions
--- a/src/wscript
+++ b/src/wscript
@@ -21,6 +21,7 @@ all_modules = (
    'applications/onoff',
    'applications/packet-sink',
    'applications/udp-echo',
+    'routing/olsr',
    'routing/global-routing',
    'mobility',
    'devices/wifi',