diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /mesalib/src/mesa/main/descrip.mms | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'mesalib/src/mesa/main/descrip.mms')
| -rw-r--r-- | mesalib/src/mesa/main/descrip.mms | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/descrip.mms b/mesalib/src/mesa/main/descrip.mms index 70bc26372..91d7225c3 100644 --- a/mesalib/src/mesa/main/descrip.mms +++ b/mesalib/src/mesa/main/descrip.mms @@ -42,6 +42,7 @@ SOURCES =accum.c \ drawpix.c \ enable.c \ enums.c \ + errors.c \ eval.c \ execmem.c \ extensions.c \ @@ -116,6 +117,7 @@ dlist.obj,\ drawpix.obj,\ enable.obj,\ enums.obj,\ +errors.obj,\ eval.obj,\ execmem.obj,\ extensions.obj,\ @@ -200,6 +202,7 @@ dlist.obj : dlist.c drawpix.obj : drawpix.c enable.obj : enable.c enums.obj : enums.c +errors.obj : errors.c eval.obj : eval.c execmem.obj : execmem.c extensions.obj : extensions.c |