Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
hg update 50ca5dd0191bhg pull -r default https://bitbucket.org/Machtan/pygame-small-mac-fix# Note: This will create a new head!hg merge c66b8f945e5dhg commit -m 'Merged in Machtan/pygame-small-mac-fix (pull request #29)'
Added a change so that mac either uses local SDL libraries, or ones from a framework file.
This should remove PyObjC warning about it not knowing which SDL lib to use, that appeared when some dependencies were found in /usr/local/lib and some in /Library/Frameworks/SDL.framework (due to local libs being checked before frameworks). Now it first checks for local libs, but falls back on only using the framework if any of these dependencies fail.
( I apologize if the code might be a little bit messy ).