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

Windows build fixes #576

Merged
merged 3 commits into from
Dec 14, 2014
Merged

Windows build fixes #576

merged 3 commits into from
Dec 14, 2014

Commits on Dec 13, 2014

  1. Configuration menu
    Copy the full SHA
    d28d317 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/upstream/master'

    Conflicts:
    	common/thread/Utils.cpp
    lukase committed Dec 13, 2014
    Configuration menu
    Copy the full SHA
    81eaa2a View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2014

  1. Configuration menu
    Copy the full SHA
    53be901 View commit details
    Browse the repository at this point in the history