Bugfix vs project template (pt.2) #6130
Merged
Conversation
This file contains 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
olekristensen
added a commit
to olekristensen/openFrameworks
that referenced
this pull request
Jan 2, 2019
…orks into stable * 'stable' of https://github.com/openframeworks/openFrameworks: (105 commits) create_package: pull OF from github instead of local create_package: pull PG from master always PG latest commit changelof for 0.10.1 ofTruetypeFont: Fix kerning factor. openframeworks#6136 ofConstants: revert version to 0.10.1 ofSoundBuffer getChannel fix (openframeworks#6117) ofxGui: slider scrolling (openframeworks#6144) appveyor: fix ssl dependencies (openframeworks#6170) fix for xcode template file to allow PG to add frameworks and fix broken projects. closes openframeworks#6172 workspace files for xcode template to enable legacy build in Xcode 10 added camera and microphone permissions for mojave fix drawArrow internal matrix calculation (openframeworks#6164) remove i386 architecture (openframeworks#6159) Revert "Update main.cpp (openframeworks#6150)" (openframeworks#6160) Update main.cpp (openframeworks#6150) fixes xcode template to not have OF as a dependcy but as a pre-build script. related to openframeworks#6139 ofCamera with ortho enabled will respect a lensOffset by translating the projection matrix (openframeworks#6138) ofXml: add clear method which clears the xml doc Bugfix vs project template (pt.2) (openframeworks#6130) ... # Conflicts: # libs/openFrameworks/app/ofAppGLFWWindow.cpp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
add a missing commit
#6122 (comment)