branch merge

This commit is contained in:
Craig Dowell committed 2010-02-23 12:18:35 -08:00
commit 8b4770ff79
47 files changed
+2707 -1217

No files matched your search

+2 -2
View File
@@ -67,7 +67,7 @@ public:
/**
* \brief Specify application start time
* \param startTime Start time for this application,
* \param start Start time for this application,
* relative to the current simulation time.
*
* Applications start at various times in the simulation scenario.
@@ -80,7 +80,7 @@ public:
/**
* \brief Specify application stop time
* \param stopTime Stop time for this application, relative to the
* \param stop Stop time for this application, relative to the
* current simulation time.
*
* Once an application has started, it is sometimes useful
+1 -1
View File
@@ -529,7 +529,7 @@ public:
* is also possible to bind to mismatching device and address, even if
* the socket can not receive any packets as a result.
*
* \param Netdevice Pointer to Netdevice of desired interface
* \param netdevice Pointer to Netdevice of desired interface
* \returns nothing
*/
virtual void BindToNetDevice (Ptr<NetDevice> netdevice);