Periodic merge of staging to master #14

Merged
steveej merged 71 commits from staging into master 2019-01-18 10:53:52 +00:00
Showing only changes of commit 677894c833 - Show all commits

View file

@ -203,9 +203,9 @@ for i in range(0, screens_count+1):
widget.WindowName(), widget.WindowName(),
widget.Prompt(), widget.Prompt(),
widget.CPUGraph(), widget.CPUGraph(),
widget.MemoryGraph(), widget.Memory(),
widget.NetGraph(bandwidth_type='down'), widget.Net(interface='eth0'),
widget.NetGraph(bandwidth_type='up'), widget.Net(interface='wlan0'),
widget.Clock(format='%Y-%m-%d %a %I:%M %p'), widget.Clock(format='%Y-%m-%d %a %I:%M %p'),
] ]
if i is 0: if i is 0: