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 merge conflicts in #3218 #3500

Merged
merged 4 commits into from
Jun 11, 2018
Merged

Fix merge conflicts in #3218 #3500

merged 4 commits into from
Jun 11, 2018

Commits on Jun 10, 2018

  1. Configuration menu
    Copy the full SHA
    96345f6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    75c4fa5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ba6bbc1 View commit details
    Browse the repository at this point in the history
  4. fix build of demos

    pmairoldi committed Jun 10, 2018
    Configuration menu
    Copy the full SHA
    89706c0 View commit details
    Browse the repository at this point in the history