aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/Makefile.sources
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-05-01 17:03:50 +0200
committermarha <marha@users.sourceforge.net>2014-05-01 17:03:50 +0200
commitaadab8d97e31348ffe45d1e5d36ad90b0ccd17aa (patch)
tree37bc7921f864ead4f6eb357b31a1eb66d46aaef9 /mesalib/src/mapi/Makefile.sources
parent2e0adb33e03e3142f1412ed570415c5ce616dcef (diff)
parentea0cd87ecbe9fc3c5503ccad7f87a895a458d6d4 (diff)
downloadvcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.gz
vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.tar.bz2
vcxsrv-aadab8d97e31348ffe45d1e5d36ad90b0ccd17aa.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libxcb/src/xcb_util.c mesalib/src/mesa/drivers/dri/common/dri_util.c xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/mapi/Makefile.sources')
-rw-r--r--mesalib/src/mapi/Makefile.sources1
1 files changed, 1 insertions, 0 deletions
diff --git a/mesalib/src/mapi/Makefile.sources b/mesalib/src/mapi/Makefile.sources
index 37ca4842c..4ce1afb23 100644
--- a/mesalib/src/mapi/Makefile.sources
+++ b/mesalib/src/mapi/Makefile.sources
@@ -32,6 +32,7 @@ MAPI_BRIDGE_FILES = \
$(TOP)/src/mapi/mapi_tmp.h
MAPI_FILES = \
+ $(TOP)/src/mapi/entry.c \
$(TOP)/src/mapi/mapi.c \
$(TOP)/src/mapi/mapi.h \
$(TOP)/src/mapi/stub.c \