From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sat, 7 May 2011 18:02:46 +0000 (+0100)
Subject: Merge branch 'master' into dynamic_routing
X-Git-Url: https://git.richardwhiuk.com/?a=commitdiff_plain;h=bf5fab45a5605bf2756628f800512f80cadca1f7;p=ns-moose.git

Merge branch 'master' into dynamic_routing

Conflicts:
	src/devices/bridge/wscript
---

bf5fab45a5605bf2756628f800512f80cadca1f7
diff --cc src/devices/bridge/wscript
index 3f1fe86,110bd5f..d833533
--- a/src/devices/bridge/wscript
+++ b/src/devices/bridge/wscript
@@@ -18,7 -16,8 +20,9 @@@ def build(bld)
      headers = bld.new_task_gen('ns3header')
      headers.module = 'bridge'
      headers.source = [
 +	'model/bpdu-header.h',
+ 	'model/bridge-state.h',
+ 	'model/moose-bridge-state.h',
          'model/moose-bridge-port-net-device.h',
  	'model/moose-bridge-net-device.h',
          'model/bridge-net-device.h',