vcxsrv/xorg-server/glx/util, branch bugfix/bug4
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug4
2015-04-30T21:29:47+00:00
Merge remote-tracking branch 'origin/released'
2015-04-30T21:29:47+00:00
marha
marha@users.sourceforge.net
2015-04-30T21:26:47+00:00
urn:sha1:055e5645a789d2822d3c4e5a3bc81ff6a969ff31
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