greatbody
/
glances
mirror of https://github.com/nicolargo/glances
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update release note

pull/379/head
Nicolargo 2014-06-14 10:02:46 +02:00
parent 5142de4ec8
commit 09bdb9de74
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
NEWS
View File

@ -1,12 +1,3 @@
<<<<<<< HEAD
Version 1.7.7
=============
* Fix CVS export [issue #348]
* Adapt to PSUtil 2.1.1
* Compatibility with Python 3.4
* Improve German update
=======
==============================================================================
Glances Version 2.x
==============================================================================
@ -74,37 +65,24 @@ Glances Version 1.x
Version 1.7.7
=============
* Fix CVS export [issue #348]
* Adapt to PSUtil 2.1.1
* Compatibility with Python 3.4
* Improve German update
>>>>>>> release/v2.0
* Fix CVS export [issue #348]
* Adapt to PSUtil 2.1.1
* Compatibility with Python 3.4
* Improve German update
Version 1.7.6
=============
<<<<<<< HEAD
* Adapt to psutil 2.0.0 API
* Fixed psutil 0.5.x support on Windows
* Fix help screen in 80x24 terminal size
* Implement toggle of process list display ('z' key)
=======
* Adapt to psutil 2.0.0 API
* Fixed psutil 0.5.x support on Windows
* Fix help screen in 80x24 terminal size
* Implement toggle of process list display ('z' key)
>>>>>>> release/v2.0
Version 1.7.5
=============
<<<<<<< HEAD
* Force the Pypi installer to use the PsUtil branch 1.x (#333)
=======
* Force the Pypi installer to use the PsUtil branch 1.x (#333)
>>>>>>> release/v2.0
Version 1.7.4
=============