From ba5e1c141e05f93052ba3c533b24fbed58ff3fb1 Mon Sep 17 00:00:00 2001
From: gabri94 <gabrihacker@gmail.com>
Date: Mon, 11 May 2015 02:59:11 +0200
Subject: [PATCH 1/2] Addedd BMX6 parser using b6m tool to generate the
 topology. Created base tests to validate the results with some simple
 topologies

---
 netdiff/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/netdiff/__init__.py b/netdiff/__init__.py
index 9a1cd40..633b9a5 100644
--- a/netdiff/__init__.py
+++ b/netdiff/__init__.py
@@ -5,4 +5,5 @@
 from .parsers.bmx6 import Bmx6Parser  # noqa
 from .parsers.netjson import NetJsonParser  # noqa
 from .parsers.cnml import CnmlParser  # noqa
+from .parsers.bmx6 import Bmx6Parser  # noqa
 from .utils import diff  # noqa

From 64610f44ff12b54fab67e5e8d96922e7fc1f4773 Mon Sep 17 00:00:00 2001
From: Pablo Castellano <pablo@anche.no>
Date: Tue, 12 May 2015 11:37:19 +0200
Subject: [PATCH 2/2] README: Added latest supported parsers

---
 README.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 3d87551..764d5ab 100644
--- a/README.rst
+++ b/README.rst
@@ -94,9 +94,11 @@ Parsers also have a ``json`` method which returns valid `NetJSON output <https:/
 
 The available parsers are:
 
-* ``netdiff.OlsrParser``: parser for the OLSR 0.6.x jsoninfo plugin
 * ``netdiff.BatmanParser``: parser for the batman-advanced alfred tool
+* ``netdiff.Bmx6Parser``: parser for BMX6
+* ``netdiff.CnmlParser``: parser for `CNML <http://cnml.info/`__  0.1
 * ``netdiff.NetJsonParser``: parser for the ``NetworkGraph`` `NetJSON object <https://github.com/interop-dev/json-for-networks#network-graph>`__.
+* ``netdiff.OlsrParser``: parser for the OLSR 0.6.x jsoninfo plugin
 
 Parsers must be initialized with a string which can represent one of the following: