Merge branch '2.0dev' into 2.0merge

Conflicts: .gitignore .pylint examples/miniedit.py mininet/node.py mininet/util.py util/install.sh util/vm/install-mininet-vm.sh
2012-11-15 22:54:27 -08:00
parent ad85e44d78 1f1d590c7a
commit ab594b6afe
62 changed files with 5391 additions and 1539 deletions
@@ -1,6 +1,14 @@
 mnexec
 *.pyc
 *~
+*.1
+*.xcodeproj
+*.xcworkspace
+\#*\#
 mininet.egg-info
 build
 dist
+doc/html
+doc/latex
+trunk
+