Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[estuary] sync #11014

Merged
merged 1 commit into from Nov 30, 2016

Conversation

Projects
None yet
3 participants
@phil65
Copy link
Member

commented Nov 30, 2016

another sync. @ronie

@MartijnKaijser MartijnKaijser added this to the Krypton 17.0-beta6 milestone Nov 30, 2016

@MartijnKaijser MartijnKaijser merged commit 654f1b7 into xbmc:master Nov 30, 2016

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
@@ -82,7 +82,8 @@
<label2>$INFO[Skin.String(background_overlay),$LOCALIZE[467] ]</label2>
<include>DefaultSettingButton</include>
<onclick condition="String.IsEqual(Skin.String(background_overlay),1)">Skin.SetString(background_overlay,2)</onclick>
<onclick condition="String.IsEqual(Skin.String(background_overlay),6)">Skin.SetString(background_overlay,1)</onclick>
<onclick condition="String.IsEqual(Skin.String(background_overlay),7)">Skin.SetString(background_overlay,1)</onclick>

This comment has been minimized.

Copy link
@ronie

ronie Nov 30, 2016

Member

this one is listed twice:
<onclick condition="String.IsEqual(Skin.String(background_overlay),1)">Skin.SetString(background_overlay,2)</onclick>

@ronie

This comment has been minimized.

Copy link
Member

commented Nov 30, 2016

all ok as far as i can tell.

@phil65 phil65 deleted the phil65:estuary_update branch Dec 11, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.