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

vcs #31

Open
wants to merge 2,483 commits into
base: master
Choose a base branch
from
Open

vcs #31

wants to merge 2,483 commits into from

Conversation

MaZaHa-Ka
Copy link

new branch vcs

Sergeanur and others added 30 commits July 25, 2021 21:01
# Conflicts:
#	src/renderer/Hud.cpp
# Conflicts:
#	src/audio/AudioLogic.cpp
# Conflicts:
#	src/audio/AudioLogic.cpp
Sergeanur and others added 30 commits August 29, 2021 13:29
# Conflicts:
#	src/audio/AudioManager.h
# Conflicts:
#	src/audio/AudioManager.h
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/AudioSamples.h
#	src/audio/sampman_miles.cpp
# Conflicts:
#	src/audio/AudioManager.cpp
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/sampman.h
#	src/audio/sampman_miles.cpp
#	src/audio/sampman_oal.cpp
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.

9 participants