Xinqi Bao's Git

projects / slstatus.git / commitdiff
summary | log | commit | diff | tree
raw | combined (merge: e6158e3 f131041)
Merge branch 'master' of https://github.com/drkh5h/slstatus
authorAli H. Fardan <[email protected]>
Wed, 14 Sep 2016 00:24:53 +0000 (03:24 +0300)
committerAli H. Fardan <[email protected]>
Wed, 14 Sep 2016 00:24:53 +0000 (03:24 +0300)
1  2 
slstatus.c patch | diff1 | diff2 | blob | history

diff --cc slstatus.c
Simple merge