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.

Sign up for GitHub

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

Jump to bottom

merging changes from master to dev #28

Merged
merged 3 commits into from Nov 6, 2016
Merged

merging changes from master to dev #28

merged 3 commits into from Nov 6, 2016

Commits on Nov 5, 2016

  1. Adding GLFW3 and Vulkan instalation instructions

    @jadsilva
    jadsilva committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    61f1fd5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from jadsilva/master 

    Adding GLFW3 and Vulkan instalation instructions
    @MattGuerrette
    MattGuerrette committed Nov 5, 2016
    6 Configuration menu
    Copy the full SHA
    99f0c71 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2016

  1. Merge pull request #26 from thirddegree/dev 

    merge dev into master
    @MattGuerrette
    MattGuerrette committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    d384d94 View commit details
    Browse the repository at this point in the history