Pull requests

#41 Open
Repository
npepinpe npepinpe
Branch
osx-use-system-zlib
Repository
richard42 richard42
Branch
default

Use system zlib on OSX

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 default
hg pull -r osx-use-system-zlib https://bitbucket.org/npepinpe/mupen64plus-core
hg merge osx-use-system-zlib
hg commit -m 'Merged in npepinpe/mupen64plus-core/osx-use-system-zlib (pull request #41)'
Author
  1. npepinpe
Reviewers
Description

Avoids having to create a zlib.pc for pkg-config on OSX.

Comments (0)