merge
authorNicola Baldo <nicola@baldo.biz>
Sat, 06 Apr 2013 18:58:56 +0200
changeset 9682 ba02f669aa64
parent 9681 962f73b9d46c (current diff)
parent 9291 a41000272344 (diff)
child 9684 53599b6a2e30
merge
src/antenna/doc/source/conf.py
src/spectrum/model/multi-model-spectrum-channel.cc
--- a/src/antenna/doc/source/conf.py	Sat Apr 06 18:32:53 2013 +0200
+++ b/src/antenna/doc/source/conf.py	Sat Apr 06 18:58:56 2013 +0200
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'lena-dev'
+version = 'ns-3-dev'
 # The full version, including alpha/beta/rc tags.
-release = 'lena-dev'
+release = 'ns-3-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/src/spectrum/model/multi-model-spectrum-channel.cc	Sat Apr 06 18:32:53 2013 +0200
+++ b/src/spectrum/model/multi-model-spectrum-channel.cc	Sat Apr 06 18:58:56 2013 +0200
@@ -236,7 +236,7 @@
     }
   return txInfoIterator;
 }
-    
+
     
 
 void