Automated merge with file:///Users/barnes26/Code/netsim/ns3/repos/ns-3-dev

This commit is contained in:
Peter D. Barnes, Jr.
2012-07-31 20:20:03 -07:00

View File

@@ -27,11 +27,16 @@ var ns3_api = ns3_rel + ns3_doxy + ns3_index;
// The Sphinx layout template defines
// var ns3_builder = "html", or "singlehtml"
// so we can condition the links on single/multi-page view.
if ( (typeof ns3_builder != 'undefined') && (ns3_builder == "singlehtml") ) {
ns3_index = ns3_local + "singlehtml/" + ns3_index;
} else {
ns3_index = ns3_local + "html/" + ns3_index;
}
if (typeof ns3_builder != 'undefined') {
if (ns3_builder == "singlehtml") {
ns3_index = ns3_local + "singlehtml/" + ns3_index;
} else {
ns3_index = ns3_local + "html/" + ns3_index;
}
else {
ns3_index = ns3_local + "html/" + ns3_index;
}
var ns3_man = ns3_rel + "manual/" + ns3_index;
var ns3_mod = ns3_rel + "models/" + ns3_index;