Yuya Ochiai 4fb0bf67ba Merge pull request #128 from jnugh/linuxTrayIcon ...

Manually merged.
Conflicts:
	src/browser/settings.jsx
	src/common/settings.js

2016-05-17 21:41:07 +09:00

..

osVersion.js

Use balloon notification on Windows from 7 to 8.1

2015-11-28 14:30:25 +09:00

settings.js

Merge pull request #128 from jnugh/linuxTrayIcon

2016-05-17 21:41:07 +09:00