diff --git a/.hgignore b/.hgignore
index cd5797518..3345a123a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,7 +7,7 @@
^testpy-output
^doc/html
^doc/latex
-^\.lock-wscript
+^\.lock-wafbuild
^\.waf
^doc/introspected-doxygen\.h$
.*\.py[co]$
@@ -26,6 +26,7 @@
^src/.*/doc/source/figures/.*.eps
^src/.*/doc/source/figures/.*.pdf
^src/.*/doc/source/figures/.*.png
+^bindings/python/pybindgen/
ms_print.*
massif.*
\.patch$
diff --git a/.hgtags b/.hgtags
index c483b5975..8d71042c4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -58,3 +58,5 @@ def4153e27cd744f117acf8c509979617850da83 ns-3.9-RC3
0a7a16b599e86ca7884e5b5772bf7c5cfe146603 ns-3.11-RC2
e48ed3aabca6ad71c8c49e4604c0f83345eda6a8 ns-3.11-RC3
9843c12351cb5ceb9613c9db390d94073b713284 ns-3.11
+19c9e2b33b4a53f200be80cd49810bdfecf76770 ns-3.12-RC1
+167fc2274f53d4d89fdd769e4a7683ad7b6b7157 ns-3.12
diff --git a/CHANGES.html b/CHANGES.html
index e9f8e440b..9ce02915b 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -44,8 +44,34 @@ to this file based on your experience, please contribute a patch or drop
us a note on ns-developers mailing list.
-
Changes from ns-3.11 to ns-3.12
+
Changes from ns-3.12 to ns-3.13
+
+
Changes to build system:
+
The underlying version of waf used by ns-3 was upgraded to 1.6.7.
+This has a few changes for users and developers:
+
+
by default, "build" no longer has a subdirectory debug or optimized.
+To get different build directories for different build types, you can use
+the waf configure -o xxx option, e.g.:
+
no longer need to edit src/wscript to add a module, just create your
+module directory inside src and ns-3 will pick it up
+
In WAF 1.6, adding -Dxxx options is done via the DEFINES env. var.
+instead of CXXDEFINES
+
waf env values are always lists now, e.g. env['PYTHON'] returns
+['/usr/bin/python'], so you may need to add [0] to the value in some places
+
New API:
@@ -54,12 +80,55 @@ us a note on ns-developers mailing list.
Changes to existing API:
+
The WifiPhyStandard enumerators for specifying half- and quarter-channel
+width standards has had a change in capitalization:
+
+
WIFI_PHY_STANDARD_80211_10Mhz was changed to WIFI_PHY_STANDARD_80211_10MHZ
+
WIFI_PHY_STANDARD_80211_5Mhz was changed to WIFI_PHY_STANDARD_80211_5MHZ
+
+
In the SpectrumPhy base class, the methods to get/set the
+ MobilityModel and the NetDevice were previously working with
+ opaque Ptr<Object>. Now all these methods have been
+ changed so that they work with Ptr<NetDevice>
+ and Ptr<MobilityModel> as appropriate. See Bug 1271 on
+ bugzilla for the motivation.
+
Changed behavior:
+
+
Changes from ns-3.11 to ns-3.12
+
+
Changes to build system:
+
+
+
+
New API:
+
+
New method, RegularWifiMac::SetPromisc (void), to set the interface
+to promiscuous mode.
+
+
+
Changes to existing API:
+
+
The spelling of the attribute 'IntialCellVoltage' from LiIonEnergySource
+was corrected to 'InitialCellVoltage'; this will affect existing users who
+were using the attribute with the misspelling.
+
Two trace sources in class WifiPhy have had their names changed:
+