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

(fix) display tooltips on All demos view #4702

Merged
merged 3 commits into from
Dec 6, 2016
Merged

(fix) display tooltips on All demos view #4702

merged 3 commits into from
Dec 6, 2016

Conversation

tekhaus
Copy link
Contributor

@tekhaus tekhaus commented Dec 1, 2016

@pjcozzi
Copy link
Contributor

pjcozzi commented Dec 1, 2016

@emackey do you want to look at this?

@hpinkos
Copy link
Contributor

hpinkos commented Dec 1, 2016

@tekhaus we updated electron in master, so if you update your branch CI should pass

@tekhaus
Copy link
Contributor Author

tekhaus commented Dec 1, 2016

@hpinkos merged from upstream master and pushed to my fork... how do I get CI to rerun on this PR ?

@hpinkos
Copy link
Contributor

hpinkos commented Dec 1, 2016

merge your fork's master into this branch and push that up. That should make CI run again

@hpinkos
Copy link
Contributor

hpinkos commented Dec 6, 2016

Thanks @tekhaus, I can confirm this fixes the problem. There were some merge issues with your branch, so I just merged master and pushed that up.
Thanks again!

@hpinkos
Copy link
Contributor

hpinkos commented Dec 6, 2016

Oh actually, before I merge this, can you add yourself to https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTORS.md?

@pjcozzi
Copy link
Contributor

pjcozzi commented Dec 6, 2016

Also, one last small request: please update CHANGES.md.

@hpinkos hpinkos merged commit 6bc11e8 into CesiumGS:master Dec 6, 2016
@hpinkos
Copy link
Contributor

hpinkos commented Dec 6, 2016

@pjcozzi I'll update CHANGES in master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants