vcxsrv/xorg-server/hw/xquartz/bundle, branch 1.11.2.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.2.0
2011-09-12T09:27:51+00:00
Synchronised line endinge with release branch
2011-09-12T09:27:51+00:00
marha
marha@users.sourceforge.net
2011-09-12T09:27:51+00:00
urn:sha1:dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0
Merge remote-tracking branch 'origin/released'
2011-08-04T14:54:51+00:00
marha
marha@users.sourceforge.net
2011-08-04T14:54:51+00:00
urn:sha1:23cc74efd16feb2676978b9919a8510ed7804ed9
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
randrproto mesa xserver git update 4 aug 2011
2011-08-04T14:44:35+00:00
marha
marha@users.sourceforge.net
2011-08-04T14:44:35+00:00
urn:sha1:9b009a8bdb31d08e3d07f68416373b9aa6f85724
Merge remote-tracking branch 'origin/released'
2011-07-26T10:48:28+00:00
marha
marha@users.sourceforge.net
2011-07-26T10:48:28+00:00
urn:sha1:dc23661fa1d58aa98d67fae47a919de452b8cd28
Conflicts:
libX11/specs/libX11/CH11.xml
mesalib/src/glsl/main.cpp
mesalib/src/mesa/main/compiler.h
mesalib/src/mesa/main/get.c
mesalib/src/mesa/main/texcompress.c
mesalib/src/mesa/main/texparam.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/program/prog_optimize.c
pixman/pixman/pixman-fast-path.c
pixman/pixman/pixman-fast-path.h
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.h
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist
xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib
xorg-server/hw/xquartz/darwinEvents.c
xorg-server/hw/xquartz/darwinEvents.h
xorg-server/hw/xquartz/man/Xquartz.man
xorg-server/hw/xquartz/xpr/dri.c
xorg-server/xkeyboard-config/symbols/ee
libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011
2011-07-26T06:58:05+00:00
marha
marha@users.sourceforge.net
2011-07-26T06:58:05+00:00
urn:sha1:ece07bdeaa82ea59e74bcfc588bcabe5e47567c1
svn merge ^/branches/released .
2011-04-28T11:14:32+00:00
marha
marha@users.sourceforge.net
2011-04-28T11:14:32+00:00
urn:sha1:1840c5631682e0a69ed11487a23a43d45f2d15e1
xserver xkeyboard-config mesa git update 28 Apr 2011
2011-04-28T07:58:00+00:00
marha
marha@users.sourceforge.net
2011-04-28T07:58:00+00:00
urn:sha1:57a879849643e79d9674198a3a77c59532fb79b4
svn merge ^/branches/released .
2011-03-04T15:38:04+00:00
marha
marha@users.sourceforge.net
2011-03-04T15:38:04+00:00
urn:sha1:3592ad31cfc72ffff3c9024eecea7d3b987c7954
xserver xkeyboard-config mesa git update 4 Marc 2011
2011-03-04T13:54:03+00:00
marha
marha@users.sourceforge.net
2011-03-04T13:54:03+00:00
urn:sha1:0a5888393c68f6f7db86206d1f277232db18240b
svn merge ^/branches/released .
2011-02-25T08:27:07+00:00
marha
marha@users.sourceforge.net
2011-02-25T08:27:07+00:00
urn:sha1:27b0ed125725f09242054563bb65ac20cfaa17ff