diff options
author | Tomas Touceda <chiiph@riseup.net> | 2013-06-19 14:34:06 -0300 |
---|---|---|
committer | Tomas Touceda <chiiph@riseup.net> | 2013-06-19 14:34:06 -0300 |
commit | 50d26f70a2d1ae4fc3644ddef9ceb22cb46fdca3 (patch) | |
tree | 3f7d668b400fff011a6c65d7173c9edc8de159b8 | |
parent | b3dc32412f78da03192e0ddae9648012620c444d (diff) | |
parent | c64f74558c267e994bf07294a1cb899309b1c1ab (diff) |
Merge remote-tracking branch 'micah/bug/2849' into develop
-rw-r--r-- | VERSION.md | 2 | ||||
-rwxr-xr-x | pkg/utils/bootstrap | 2 | ||||
-rwxr-xr-x | pkg/utils/test_bootstrap | 2 | ||||
-rw-r--r-- | setup.py | 2 | ||||
-rw-r--r-- | src/leap/mx/__init__.py | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ -[leap_mx, version 0.0.1] +[leap_mx, version 0.2.2] ------------------------ Authors: Isis Agora Lovecruft, <isis@leap.se> 0x2cdb8b35 Website: https://leap.se diff --git a/pkg/utils/bootstrap b/pkg/utils/bootstrap index b76a572..4e00d09 100755 --- a/pkg/utils/bootstrap +++ b/pkg/utils/bootstrap @@ -7,7 +7,7 @@ # # @author Isis Agora Lovecruft, 0x2cdb8b35 # @date 18 February 2013 -# @version 0.0.1 +# @version 0.2.2 ############################################################################## set -ex -- diff --git a/pkg/utils/test_bootstrap b/pkg/utils/test_bootstrap index f072d10..be32160 100755 --- a/pkg/utils/test_bootstrap +++ b/pkg/utils/test_bootstrap @@ -8,7 +8,7 @@ # # @author Isis Agora Lovecruft, 0x2cdb8b35 # @date 18 February 2013 -# @version 0.0.1 +# @version 0.2.2 ############################################################################## set -ex - @@ -48,7 +48,7 @@ else: ("/etc/init.d/", ["pkg/leap_mx"])] setup( name='leap.mx', - version="0.2.2-dev", + version="0.2.2", # bump also src/leap/mx/__init__ url="http://github.com/leapcode/leap_mx", license='AGPLv3+', diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py index e3efc24..61c9a5c 100644 --- a/src/leap/mx/__init__.py +++ b/src/leap/mx/__init__.py @@ -17,4 +17,4 @@ """ Module initialization file for leap.mx . """ -__version__ = "0.2.2-dev" +__version__ = "0.2.2" |