Merge remote-tracking branch 'refs/remotes/origin/master' into develop

This commit is contained in:
angelblue05 2016-07-25 17:44:46 -05:00
commit 800d5bd4d4
2 changed files with 4 additions and 1 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.emby" <addon id="plugin.video.emby"
name="Emby" name="Emby"
version="2.2.17" version="2.2.18"
provider-name="Emby.media"> provider-name="Emby.media">
<requires> <requires>
<import addon="xbmc.python" version="2.1.0"/> <import addon="xbmc.python" version="2.1.0"/>

View file

@ -1,3 +1,6 @@
version 2.2.18
- Fix logging
version 2.2.17 version 2.2.17
- Fix crash when device wakes up - Fix crash when device wakes up
- Add option to disable external subs for direct stream - under add-on settings > playback - Add option to disable external subs for direct stream - under add-on settings > playback