vcxsrv/include/xcb, branch master
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.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
Merged origin/release (checked in because wanted to merge new stuff)
2015-02-22T20:39:56+00:00
marha
marha@users.sourceforge.net
2015-02-22T20:39:56+00:00
urn:sha1:462f18c7b25fe3e467f837647d07ab0a78aa8d2b
Compiled and synchronised
2014-08-22T19:51:08+00:00
marha
marha@users.sourceforge.net
2014-08-22T19:51:08+00:00
urn:sha1:bcb354180f20f0c410a77bd32cbf2c1e799632d5
Update project files to solved compilation problems due to latest merge
2014-06-26T09:59:47+00:00
marha
marha@users.sourceforge.net
2014-06-26T09:59:47+00:00
urn:sha1:ac314766fd4f60b8ee0346b7586c1a5a6f533e11
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 files
2014-01-05T19:42:40+00:00
marha
marha@users.sourceforge.net
2014-01-05T19:42:40+00:00
urn:sha1:7b4b94b4449aec056c4c92f5cacc2f89a292a80e
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
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