Merged changes from 3.14 branch.

Merged up to commit 12364 (2012-09-11) inclusive.
This commit is contained in:
Andrew Johnson
2012-10-01 00:54:10 -05:00
8 changed files with 54 additions and 48 deletions
@@ -28,9 +28,9 @@ PYTHON_INCLUDE=/System/Library/Frameworks/Python.framework/Versions/2.3/include/
# XDarwin
#
X11_LIB=/usr/X11R6/lib
X11_INC=/usr/X11R6/include/X11
X11_INC=/usr/X11R6/include
XPM_LIB=/usr/X11R6/lib
XPM_INC=/usr/X11R6/include/X11
XPM_INC=/usr/X11R6/include
#
# Fink OpenMotif