diff options
| author | Nicolargo <nicolas@nicolargo.com> | 2014-06-14 10:03:35 +0200 |
|---|---|---|
| committer | Nicolargo <nicolas@nicolargo.com> | 2014-06-14 10:03:35 +0200 |
| commit | fb9095b96909328dccfbaaa2c3b1c8eef769e037 (patch) | |
| tree | 38de46ad1eb19374a0f7ee2445e81f2dacd93da7 | |
| parent | 5f0508252b90b1eb13e00187372e22bc5bce61a2 (diff) | |
Update release note
| -rw-r--r-- | NEWS | 30 |
1 files changed, 4 insertions, 26 deletions
@@ -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 ============= |