Manually merged changes from upstream - #1
Open
PQCraft wants to merge 3 commits into
Open
Conversation
Merged:
ec2011c: Add PLM_NO_STDIO
b250bcb: Add support for seek and tell callbacks
ffa0b72: Disable MSVC security warnings
6d4733a: Reset has_ended flag when rewinding; close phoboslab#49
32397c5: Fix audio inverted phase; see phoboslab#52
70f4814: Fix low volume output
Fixed some include issues
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merged:
ec2011c8cfd97fb0db7c7fa3a34929d80712da32:Add PLM_NO_STDIOb250bcb43c377e2369eb854289fa4571b3260b26:Add support for seek and tell callbacksffa0b724ccf4e8752eb22fdee118238616d2d58c:Disable MSVC security warnings6d4733aed57e29d12344b926ca478c9d770badfb:Reset has_ended flag when rewinding; close phoboslab#4932397c55004f7be539a21e41966e13404fe890ab:Fix audio inverted phase; see phoboslab#5270f4814d1c720f4ad2b995272ff6b07accfc6b57:Fix low volume outputc871f2be022ece7ef4f64230b4fb8e1fb9eb6023:Fix corrupt slice check; close #64Fixed some include issues