merge 3.6

This commit is contained in:
Benjamin Peterson 2016-09-19 22:20:19 -07:00
commit b90d15d57e

View file

@ -26,7 +26,7 @@
* http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115 * http://lxr.mozilla.org/seamonkey/source/modules/libimg/png/mozpngconf.h#115
* *
* The list of relevant exported symbols can be had with this command: * The list of relevant exported symbols can be had with this command:
* *
nm pyexpat.so \ nm pyexpat.so \
| grep -v " [a-zBUA] " \ | grep -v " [a-zBUA] " \
| grep -v "_fini\|_init\|initpyexpat" | grep -v "_fini\|_init\|initpyexpat"