Commit Graph
8 Commits
Author SHA1 Message Date
Bob Lantz ab594b6afe 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
Bob Lantz 4f33cad025 Ignore more stuff, notably generated docs and man pages. 2012-08-17 18:20:22 -07:00
Bob Lantz ea7c326017 Ignore emacs autosaves. 2012-03-20 15:50:44 -07:00
Bob Lantz 5562e66a2d Ignore build, dist and emacs backup~ files. 2012-03-12 16:14:00 -07:00
Bob Lantz 542fb6167e Ignore build, dist and emacs autosaves. 2012-03-02 20:36:57 -08:00
Brandon Heller a165881049 Ignore pyc files 2010-03-14 03:53:16 -07:00
Bob Lantz 7f9eb9e540 Changed remaining refs to netns to refer to mnexec. 2010-03-14 19:28:19 -07:00
Brandon Heller 77529ce550 Ignore binary and egg data 2010-03-12 16:13:08 -08:00