Merge branch 'master' into 2.0

2024-11-16 08:44:52 +02:00 · 2016-08-18 21:34:52 +02:00 · 2016-08-18 21:34:52 +02:00 · 3e3e7b93ae
commit 3e3e7b93ae
parent 1c2a56ee8e 6b8e93f847
3 changed files with 1 additions and 1 deletions
--- a/gns3server/utils/vmnet.py
+++ b/gns3server/utils/vmnet.py
--- a/setup.py
+++ b/setup.py
@ -53,7 +53,7 @@ setup(
    entry_points={
        "console_scripts": [
            "gns3server = gns3server.main:main",
-            "gns3vmnet = utils.vmnet:main",
+            "gns3vmnet = gns3server.utils.vmnet:main",
        ]
    },
    packages=find_packages(".", exclude=["docs", "tests"]),
--- a/utils/init.py
+++ b/utils/init.py