aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-28 15:21:45 +0100
committermarha <marha@users.sourceforge.net>2012-01-28 15:21:45 +0100
commit59bda88ffb9deb72a727e7d6b4c141fd7d4678f4 (patch)
treea797879cc0fe54172dba50354b635b1f595081db /mesalib/src/mapi/glapi
parent829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (diff)
parent1aee8dafb5391e093f3a111f906ab0d8b6775510 (diff)
downloadvcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.gz
vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.tar.bz2
vcxsrv-59bda88ffb9deb72a727e7d6b4c141fd7d4678f4.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'mesalib/src/mapi/glapi')
-rw-r--r--mesalib/src/mapi/glapi/SConscript1
1 files changed, 0 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index dad7d5972..9882806ce 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -38,7 +38,6 @@ glapi_sources = [
mapi_sources = [
'u_current.c',
'u_execmem.c',
- 'u_thread.c',
]
for s in mapi_sources:
o = env.SharedObject(s[:-2], '../mapi/' + s)