vcxsrv/include/xcb/xcbext.h, branch master
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://isbjoern.arctica-project.org/vcxsrv/atom?h=master
2015-06-15T19:36:28+00:00
Merge remote-tracking branch 'origin/released'
2015-06-15T19:36:28+00:00
marha
marha@users.sourceforge.net
2015-06-15T19:36:28+00:00
urn:sha1:008a8d8051786badb83e455bd9281103ba9a6470
Conflicts:
freetype/src/base/ftfntfmt.c
freetype/src/cache/ftcimage.c
freetype/src/cid/cidriver.c
freetype/src/truetype/ttdriver.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
openssl/Makefile
Merge remote-tracking branch 'origin/released'
2015-05-26T17:43:34+00:00
marha
marha@users.sourceforge.net
2015-05-26T17:43:34+00:00
urn:sha1:912e881bec8b16f2331225960645c3bdf5a8ba2d
Conflicts:
mesalib/src/mapi/glapi/glapi_priv.h
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/dix/dispatch.c
xorg-server/os/utils.c
xorg-server/record/record.c
Merge remote-tracking branch 'origin/released'
2014-03-21T21:56:24+00:00
marha
marha@users.sourceforge.net
2014-03-21T21:50:26+00:00
urn:sha1:eb71c0f23999d1cc156e1821d73634ec79621fc2
* origin/released:
xserver fontconfig libX11 libXext libxcb mesa git update 21 Mar 2014
Conflicts:
libxcb/src/xcb_auth.c
libxcb/src/xcb_conn.c
libxcb/src/xcb_util.c
libxcb/src/xcb_windefs.h
mesalib/src/mapi/glapi/glapi.h
Synchronised xcbext.h and solved compiler warnings.
2013-11-21T08:33:19+00:00
marha
marha@users.sourceforge.net
2013-11-21T08:33:19+00:00
urn:sha1:675f7aa9d3437c2abb133adbefdfddd1ea1ba219
Solved compilation and run-time problems after latest merge
2013-11-08T15:53:17+00:00
marha
marha@users.sourceforge.net
2013-11-08T15:53:17+00:00
urn:sha1:3ef320ddf5d23b4e69cc7d44a17f902e245f6426
Synchronised files
2013-07-01T09:35:04+00:00
marha
marha@users.sourceforge.net
2013-07-01T09:35:04+00:00
urn:sha1:6d46609dfd488f9433d0ed10f49d05e31a6fe51e
svn merge ^/branches/released .
2010-12-29T12:20:21+00:00
marha
marha@users.sourceforge.net
2010-12-29T12:20:21+00:00
urn:sha1:053f5dfd42ade05252e586a282e34906db10828d
Synchronised files between glx and mesalib
2010-12-01T17:52:55+00:00
marha
marha@users.sourceforge.net
2010-12-01T17:52:55+00:00
urn:sha1:a7f914ef9256ee2d287e77384c01181734fd3df2
Synchronised glx with mesa
2010-09-03T14:16:57+00:00
marha
marha@users.sourceforge.net
2010-09-03T14:16:57+00:00
urn:sha1:618c64aa88755d61b734ba8b54a325a56ac830ad
Resynced include/xcb zith libxcb/src
2009-07-25T12:32:25+00:00
marha
marha@users.sourceforge.net
2009-07-25T12:32:25+00:00
urn:sha1:213d71f78d6f9e35b23c00e35f9919efc9670b1e