vcxsrv/xorg-server/glx/makefile, branch bugfix/bug3
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3
2015-03-22T13:10:47+00:00
Merge remote-tracking branch 'origin/released'
2015-03-22T13:10:47+00:00
marha
marha@users.sourceforge.net
2015-03-22T13:10:47+00:00
urn:sha1:3bc24b271f45f9f33484b8cf53b44f33f7e8a237
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mapi/glapi/glapi_nop.c
mesalib/src/mesa/main/bufferobj.c
Merge remote-tracking branch 'origin/released'
2013-12-22T12:16:58+00:00
marha
marha@users.sourceforge.net
2013-12-22T12:12:15+00:00
urn:sha1:1d03b6f684ab1ea6772f00058605a9ebb2910628
* origin/released:
libxtrans fontconfig glproto libX11 libxcb xcbproto mesa xserver pixman xkeyboard-config git update 22 Dec 2013
Conflicts:
mesalib/include/GL/glext.h
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/damageext/damageext.c
xorg-server/dix/dispatch.c
xorg-server/glx/glxdriswrast.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/glx/indirect_program.c
xorg-server/glx/render2.c
xorg-server/glx/render2swap.c
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/glthunk.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/include/os.h
xorg-server/present/present_request.c
Solved compilation and link problems after last merge
2013-11-08T10:47:30+00:00
marha
marha@users.sourceforge.net
2013-11-08T10:47:30+00:00
urn:sha1:c8483dc2831dc37d93a36804022f6b064f5962ea
Synchronised mesa and glx
2013-06-05T08:44:44+00:00
marha
marha@users.sourceforge.net
2013-06-05T08:43:27+00:00
urn:sha1:180290f941da61bd80284d817e27c01cf789ee53
Removed unneeded source file
2011-12-23T11:11:38+00:00
marha
marha@users.sourceforge.net
2011-12-23T11:11:38+00:00
urn:sha1:760c12beca7ade92ded18ffee6b8db5c173e4d4e
Added new sources to makefiles
2011-12-23T10:16:35+00:00
marha
marha@users.sourceforge.net
2011-12-23T10:16:35+00:00
urn:sha1:5b2649ae7e0c560ee1a81cfaa4a2486b4d609b52
Define _GLAPI_NO_EXPORTS in glx makefile to solve compilation problem due to latest change in glapi.h
2011-01-26T09:53:35+00:00
marha
marha@users.sourceforge.net
2011-01-26T09:53:35+00:00
urn:sha1:8ed881d7e53a99d2f2bc136c6d3277eba4cd3d3b
Use gl.h of mesa library
2010-12-27T09:28:00+00:00
marha
marha@users.sourceforge.net
2010-12-27T09:28:00+00:00
urn:sha1:936d40bb3e65fd7f8734be8aaf431f9241d7f5bc
svn merge ^/branches/released .
2010-07-14T10:57:04+00:00
marha
marha@users.sourceforge.net
2010-07-14T10:57:04+00:00
urn:sha1:8fb9d7f4ca923dc7f640a0df6c871348a3e554ab
Synchronised makefile and makefile.am
2009-11-23T08:28:15+00:00
marha
marha@users.sourceforge.net
2009-11-23T08:28:15+00:00
urn:sha1:f593d6eca47fbea066dea42c074f66f6b82769b5