the-btfash-foundation/tmux-mem-cpu-load
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	CMakeLists.txt
	README.rst
	tmux-mem-cpu-load.cpp
This commit is contained in:
Pawel "l0ner" Soltys 2015-01-17 16:21:56 +01:00
commit ee39fccc65
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.rst
View File

@ -5,7 +5,7 @@
CPU, RAM memory, and load monitor for use with tmux_
----------------------------------------------------
.. image:: https://travis-ci.org/thewtex/tmux-mem-cpu-load.png
.. image:: https://travis-ci.org/thewtex/tmux-mem-cpu-load.svg
:target: https://travis-ci.org/thewtex/tmux-mem-cpu-load
Description
@ -105,6 +105,10 @@ Contributions from:
* Justin Crawford <justinc@pci-online.net>
* krieiter <krieiter@gmail.com>
<<<<<<< HEAD
=======
* Mark Palmeri <mlp6@duke.edu>
>>>>>>> upstream/master
.. _tmux: http://tmux.sourceforge.net/