From 20acca64b5f16f3473548605b6c13f2ee0910bfb Mon Sep 17 00:00:00 2001 From: grossmj Date: Sat, 25 Oct 2014 18:01:14 -0600 Subject: [PATCH] Bump version to 1.2.dev1 --- gns3server/modules/qemu/__init__.py | 3 ++- gns3server/version.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gns3server/modules/qemu/__init__.py b/gns3server/modules/qemu/__init__.py index cc7cfdbb..c4b2dfbc 100644 --- a/gns3server/modules/qemu/__init__.py +++ b/gns3server/modules/qemu/__init__.py @@ -629,8 +629,9 @@ class Qemu(IModule): if "PROGRAMFILES" in os.environ and os.path.exists(os.environ["PROGRAMFILES"]): paths.append(os.path.join(os.environ["PROGRAMFILES"], "qemu")) elif sys.platform.startswith("darwin"): - # add a specific location on Mac OS X regardless of what's in $PATH + # add specific locations on Mac OS X regardless of what's in $PATH paths.append("/usr/local/bin") + paths.append("/opt/local/bin") for path in paths: try: for f in os.listdir(path): diff --git a/gns3server/version.py b/gns3server/version.py index a8259baf..8eeeab45 100644 --- a/gns3server/version.py +++ b/gns3server/version.py @@ -23,5 +23,5 @@ # or negative for a release candidate or beta (after the base version # number has been incremented) -__version__ = "1.1" -__version_info__ = (1, 1, 0, 0) +__version__ = "1.2.dev1" +__version_info__ = (1, 2, 0, 99)