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

Pull request for issue #33 #45

Merged
merged 5 commits into from
Nov 14, 2016
Merged

Conversation

max-devisser
Copy link
Contributor

@max-devisser max-devisser commented Nov 7, 2016

Add music to menu and gameplay.
We didn't make a separate branch for this issue. When fixing issue #30, we mistakenly merged the issue30 branch with the master branch, which could have affected code in this pull request. However, the issues were totally separate so I don't think that there will be issues, just letting you know. In the future, we won't merge branches until the pull requests have been accepted.

@MadRubicant MadRubicant merged commit 501cd34 into ucsb-cs56-projects:master Nov 14, 2016
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