Merge form master

This commit is contained in:
Nicolargo 2015-01-31 13:50:06 +01:00
commit 358bb45b4a
2 changed files with 2 additions and 2 deletions

View File

@ -257,4 +257,4 @@ LGPL. See ``COPYING`` for more details.
.. _@glances_system: https://twitter.com/glances_system
.. _glances-doc: https://github.com/nicolargo/glances/blob/master/docs/glances-doc.rst
.. _forum: https://groups.google.com/forum/?hl=en#!forum/glances-users
.. _Wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F
.. _Wiki: https://github.com/nicolargo/glances/wiki/How-to-contribute-to-Glances-%3F

View File

@ -52,7 +52,7 @@ def get_requires():
setup(
name='Glances',
version='2.3R',
version='2.3',
description="A cross-platform curses-based monitoring tool",
long_description=open('README.rst').read(),
author='Nicolas Hennion',