vcxsrv/xorg-server/hw/xwin/windialogs.c, branch 1.10.3.0
VcXsrv Windows X Server (X2Go/Arctica Builds)
https://cgit.arctica-project.org/vcxsrv/atom?h=1.10.3.0
2011-07-01T14:49:54+00:00
Merge remote-tracking branch 'origin/released'
2011-07-01T14:49:54+00:00
marha
marha@users.sourceforge.net
2011-07-01T14:49:54+00:00
urn:sha1:3bbcbc59b6d98f09b26f39d6208faec76cc6aa3e
Conflicts:
apps/xwininfo/configure.ac
libX11/configure.ac
mesalib/src/glsl/ast_function.cpp
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/glsl_parser_extras.h
mesalib/src/glsl/ir.cpp
mesalib/src/glsl/ir.h
mesalib/src/glsl/ir_constant_expression.cpp
mesalib/src/glsl/ir_validate.cpp
mesalib/src/glsl/lower_mat_op_to_vec.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
mesalib/src/mesa/state_tracker/st_cb_texture.c
mesalib/src/mesa/state_tracker/st_context.h
mesalib/src/mesa/state_tracker/st_format.h
mkfontscale/configure.ac
xorg-server/Xext/xvmc.c
xorg-server/configure.ac
xorg-server/dix/Makefile.am
xorg-server/fb/fbarc.c
xorg-server/fb/fbgc.c
xorg-server/glx/glapi_gentable.c
xorg-server/glx/glxdri2.c
xorg-server/glx/glxscreens.c
xorg-server/hw/xfree86/Makefile.am
xorg-server/hw/xfree86/loader/Makefile.am
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/mach-startup/Makefile.am
xorg-server/hw/xwin/XWin.rc
xorg-server/hw/xwin/winmultiwindowwindow.c
xorg-server/hw/xwin/winmultiwindowwndproc.c
xorg-server/os/Makefile.am
xorg-server/test/Makefile.am
xorg-server/xfixes/region.c
xorg-server/xkeyboard-config/symbols/ma
xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli
2011-07-01T12:21:21+00:00
marha
marha@users.sourceforge.net
2011-07-01T12:21:21+00:00
urn:sha1:d9f970a847e1af706f07560ef163b229bb592307
2011
svn merge ^/branches/released .
2011-01-21T12:52:35+00:00
marha
marha@users.sourceforge.net
2011-01-21T12:52:35+00:00
urn:sha1:7719409ebcf17c5288114dee8f60cc9ff889fd3e
xserver mesa xkbcomp libxcb git update 21 jan 2011
2011-01-21T08:10:52+00:00
marha
marha@users.sourceforge.net
2011-01-21T08:10:52+00:00
urn:sha1:b0be6a88c8fecdf15176f642c0799bff99930e0d
svn merge ^/branches/released .
2010-12-12T20:34:06+00:00
marha
marha@users.sourceforge.net
2010-12-12T20:34:06+00:00
urn:sha1:d3ae6e21a12209f5c8cb8c84ba0f68fb69736844
xserver git update 10/12/2010
2010-12-10T19:06:59+00:00
marha
marha@users.sourceforge.net
2010-12-10T19:06:59+00:00
urn:sha1:3a20d23b48c1051e1f22295fd886cc7f643417f6
svn merge ^/branches/released .
2010-10-19T21:03:53+00:00
marha
marha@users.sourceforge.net
2010-10-19T21:03:53+00:00
urn:sha1:be10ad8a9efe4131c14c2dde36adaf11e7b125aa
xserver update 19/10/2010
2010-10-19T19:56:00+00:00
marha
marha@users.sourceforge.net
2010-10-19T19:56:00+00:00
urn:sha1:6ab3babba7b1b74528c2194a495fa1e2e67faa55
svn merge -r588:HEAD ^/branches/released .
2010-05-16T20:50:58+00:00
marha
marha@users.sourceforge.net
2010-05-16T20:50:58+00:00
urn:sha1:1c94119ae26b94a60bb2c2b33494ed43c3b8a52f
xserver git update 15/5/2010
2010-05-15T16:28:11+00:00
marha
marha@users.sourceforge.net
2010-05-15T16:28:11+00:00
urn:sha1:c38dead3ea7e177728d90cd815cf4eead0c9f534