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
..
lbry_uri_handler	move contents of lbry-osx-app into lbry repo	2016-06-20 20:43:48 -05:00
lbrygui	Merge branch 'master' into refactor-settings	2016-10-19 00:19:45 -04:00
.gitignore	ignore osx build artifacts	2016-08-16 12:25:35 -05:00
app.icns	Prettifies the osx dmg	2016-08-16 12:22:14 -05:00
dmg_background.png	Prettifies the osx dmg	2016-08-16 12:22:14 -05:00
dmg_settings.py	Prettifies the osx dmg	2016-08-16 12:22:14 -05:00
setup_app.py	fix DaemonRequest import in apps	2016-10-14 23:01:15 -04:00
setup_app.sh	need to not be in build dir	2016-08-16 15:16:55 -05:00
setup_uri_handler.py	fix DaemonRequest import in apps	2016-10-14 23:01:15 -04:00