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
..
__init__.py	move contents of lbry-osx-app into lbry repo	2016-06-20 20:43:48 -05:00
app.icns	move contents of lbry-osx-app into lbry repo	2016-06-20 20:43:48 -05:00
LBRYApp.py	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
LBRYNotify.py	fix DaemonRequest import in apps	2016-10-14 23:01:15 -04:00
main.py	move contents of lbry-osx-app into lbry repo	2016-06-20 20:43:48 -05:00