From ea0a5cf285184260cf81305b88bebc1b5f36afc5 Mon Sep 17 00:00:00 2001
From: Craig Dowell <craigdo@ee.washington.edu>
Date: Wed, 3 Sep 2008 11:38:18 -0700
Subject: [PATCH 1/3] update AUTHORS, CHANGES, RELEASE_NOTES for ns-3.2

---
 AUTHORS       |  2 ++
 CHANGES.html  | 25 +++++++++++++++++++++++++
 RELEASE_NOTES |  1 +
 3 files changed, 28 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 969ea04dd..3566e5207 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,3 +8,5 @@ Emmanuelle Laprise (emmmanuelle.laprise@bluekazoo.ca)
 Federico Maguolo (maguolof@dei.unipd.it)
 George F. Riley (riley@ece.gatech.edu)
 Guillaume Vu-Brugier (gvubrugier@gmail.com)
+Florian Westphal (fw@strlen.de)
+
diff --git a/CHANGES.html b/CHANGES.html
index 8254224c7..974f6de38 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -45,6 +45,31 @@ us a note on ns-developers mailing list.  </p>
 
 <hr>
 <h1>changes from ns-3.1 to ns-3.2</h1>
+
+<h2>new API:</h2>
+
+<li>26-08-2008; changeset 
+<a href="http://code.nsnam.org/ns-3-dev/rev/5aa65b1ea001">5aa65b1ea001</a></li>
+<ul>
+<li>
+Add multithreaded and real-time simulator implementation.  Allows for emulated
+net devices running in threads other than the main simulation thread to schedule
+events.  Allows for pacing the simulation clock at 1x real-time.
+</li>
+</ul>
+</li>
+
+
+<li>26-08-2008; changeset 
+<a href="http://code.nsnam.org/ns-3-dev/rev/c69779f5e51e">c69779f5e51e</a></li>
+<ul>
+<li>
+Add threading and synchronization primitives.  Enabling technology for 
+multithreaded simulator implementation.
+</li>
+</ul>
+</li>
+
 <h2>new API in existing classes:</h2>
 
 <ul>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index f6dd3c125..145dd61a7 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -20,6 +20,7 @@ New functionality added
   implementation a replaceable component via the 
   "SimulatorImplementationType" global value.
   Hint:  try ./waf --run "udp-echo --PrintGlobals"
+- Added multithreaded and real-time simulator implementation;
 - implement Packet::PeekHeader and Packet::PeekTrailer to avoid evil workarounds when receiving tcp packets. 
 
 Bugs fixed

From b3525f35afc06420b3c32fd21d5daa08f64dd18f Mon Sep 17 00:00:00 2001
From: Craig Dowell <craigdo@ee.washington.edu>
Date: Wed, 3 Sep 2008 11:54:46 -0700
Subject: [PATCH 2/3] Added tag ns-3.2-RC1 for changeset dfd634417b8d

---
 .hgtags | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.hgtags b/.hgtags
index 0125a554a..aeb960c97 100644
--- a/.hgtags
+++ b/.hgtags
@@ -16,3 +16,4 @@ b17f2928291eec5bf5b1c59a4a5fd583f704ac40 ns-3.0.12
 ea16c44eb90db579c83d3434fc8a960be506a7f5 ns-3.1-RC3
 42504fb1f7be7817b8be513cdcd3d9bc8f3660e8 ns-3.1
 5768685f9fdba9fbf2e9561a840f085142c73575 ns-3.1
+dfd634417b8d1896d981b6f44d8f71030611596a ns-3.2-RC1

From 720a407b59cc2e2a346bddbe62e5de81df03617e Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Wed, 3 Sep 2008 23:24:59 +0200
Subject: [PATCH 3/3] nsc: Fix build problem if gtk config store is disabled

gtk config store pulled in libdl.so for us, so things fail
to link of the config store isn't enabled. This makes nsc
pull in libdl itself when its enabled.
---
 src/internet-stack/wscript | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/internet-stack/wscript b/src/internet-stack/wscript
index fed2b8520..f932574c7 100644
--- a/src/internet-stack/wscript
+++ b/src/internet-stack/wscript
@@ -105,3 +105,4 @@ def build(bld):
         obj.source.append ('nsc-tcp-l4-protocol.cc')
         obj.source.append ('nsc-tcp-socket-factory-impl.cc')
         obj.source.append ('nsc-sysctl.cc')
+        obj.uselib = 'DL'