Merge branch 'release'

Browse Source

* release:
  cmd/syncthing: Report correct CPU usage on Windows (fixes #4133)

...

This commit is contained in:

Jakob Borg 2017-05-05 16:20:35 +02:00

parent c4b527e5e9 43569d8d36

commit b17d7d8126

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available