vcxsrv/fontconfig/src/makefile, branch bugfix/bug3
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://openid.arctica-project.org/vcxsrv/atom?h=bugfix%2Fbug3
2015-03-05T22:42:09+00:00
Merge remote-tracking branch 'origin/released'
2015-03-05T22:42:09+00:00
marha
marha@users.sourceforge.net
2015-03-05T22:40:39+00:00
urn:sha1:c646056120fe14e4c4ccf81bac5d78d61225a8e8
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/main/.gitignore
mesalib/src/mesa/main/queryobj.c
Merge remote-tracking branch 'origin/released'
2014-07-28T19:32:18+00:00
marha
marha@users.sourceforge.net
2014-07-28T19:23:36+00:00
urn:sha1:777fcfa17aafab62719446e00068f5e61ec946d5
Conflicts:
xorg-server/include/servermd.h
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
Solved crashes in 64-bit due to latest merge
2014-03-29T12:35:50+00:00
marha
marha@users.sourceforge.net
2014-03-29T12:35:50+00:00
urn:sha1:409cbaf20b5c695444bd08c87f4a186b9ac6b805
Added added source file to makefile
2013-02-05T07:31:21+00:00
marha
marha@users.sourceforge.net
2013-02-05T07:31:21+00:00
urn:sha1:012567f7279756f1fcc4aee30e5e72f0938fe3da
Use fonts.conf file in fontconfig
2013-01-08T11:41:40+00:00
marha
marha@users.sourceforge.net
2013-01-08T11:41:40+00:00
urn:sha1:e59b1896b907c5ecfe184723d4c6adc2c20fa678
Solved compile problems in fontconfig introduced by latest merge
2013-01-07T15:11:46+00:00
marha
marha@users.sourceforge.net
2013-01-07T15:11:46+00:00
urn:sha1:b73b2300e7f9b90369efd2f14f086f68ee15d55f
Merge remote-tracking branch 'origin/released'
2013-01-07T11:17:07+00:00
marha
marha@users.sourceforge.net
2013-01-07T11:17:07+00:00
urn:sha1:0e950715b62dcf30ffbf69831bf932fd348537e5
* origin/released:
pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013
Conflicts:
fontconfig/src/fcatomic.c
pixman/pixman/pixman-mmx.c
pixman/pixman/pixman-sse2.c
xorg-server/dix/dispatch.c
xorg-server/hw/xwin/wincursor.c
xorg-server/hw/xwin/winmsg.c
xorg-server/hw/xwin/winscrinit.c
xorg-server/hw/xwin/winsetsp.c
xorg-server/hw/xwin/winwin32rootless.c
xorg-server/xfixes/cursor.c
fontconfig: solved compile warnings and link errors.
2012-05-29T07:42:05+00:00
marha
marha@users.sourceforge.net
2012-05-29T07:42:05+00:00
urn:sha1:64385e98e48e5d44d0d5a8923fc9f7049e4ea7ab
svn merge ^/branches/released .
2011-03-25T15:37:13+00:00
marha
marha@users.sourceforge.net
2011-03-25T15:37:13+00:00
urn:sha1:41a502478a2972358dec934d82ee401c61a5cd36