vcxsrv/mesalib/src/mapi/glapi/gen/gl_functions.py, branch bugfix/bug4
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4
2014-03-04T11:23:48+00:00
Merge remote-tracking branch 'origin/released'
2014-03-04T11:23:48+00:00
marha
marha@users.sourceforge.net
2014-03-04T11:18:13+00:00
urn:sha1:45392e4a0642880b569ea5d4a350cdc395a2c7db
* origin/released:
libX11 libxcb mesa xserver xcb-proto xkeyboard-config git update 4 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glthread.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/main/bufferobj.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/winmultiwindowwm.c
Solved compile problems due to latest merge
2013-12-22T21:06:29+00:00
marha
marha@users.sourceforge.net
2013-12-22T21:04:41+00:00
urn:sha1:66215bff25b8961e396ea4a3b1847ac668de3ff4