Jack 6799de645b Merge branch 'master' into refactor-settings ... # Conflicts: # packaging/osx/lbry-osx-app/lbrygui/LBRYApp.py # packaging/windows/lbry-win32-app/LBRYWin32App.py		2016-10-19 00:19:45 -04:00
..
icons	Run win32 as systray app	2016-08-21 18:44:16 -04:00
LBRY-URI.reg	Python script for win registry	2016-08-28 14:33:46 -04:00
LBRYWin32App.py	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00