Skip to content

Volcano master#7

Open
JonLatane wants to merge 75 commits intofluidsynth-masterfrom
volcano-master
Open

Volcano master#7
JonLatane wants to merge 75 commits intofluidsynth-masterfrom
volcano-master

Conversation

@JonLatane
Copy link

No description provided.

# Conflicts:
#	src/utils/fluid_sys.c
#	src/utils/fluid_sys.h
#	src/utils/fluidsynth_priv.h
# Conflicts:
#	src/utils/fluid_sys.c
#	src/utils/fluid_sys.h
#	src/utils/fluidsynth_priv.h
# Conflicts:
#	src/utils/fluid_sys.c
#	src/utils/fluid_sys.h
#	src/utils/fluidsynth_priv.h
# Conflicts:
#	src/utils/fluidsynth_priv.h
# Conflicts:
#	src/utils/fluidsynth_priv.h
# Conflicts:
#	src/utils/fluidsynth_priv.h
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