vcxsrv/xorg-server/xkeyboard-config/compat, branch 1.11.3.0 VcXsrv Windows X Server (X2Go/Arctica Builds) https://cgit.arctica-project.org/vcxsrv/atom?h=1.11.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-02-20T14:23:37+00:00 marha marha@users.sourceforge.net 2011-02-20T14:23:37+00:00 urn:sha1:684eb992146cad24b690073f33b909f47150b841 xserver xkeyboard-config libX11 pixman mesa git update 2011 2011-02-20T12:29:25+00:00 marha marha@users.sourceforge.net 2011-02-20T12:29:25+00:00 urn:sha1:8a191c08ddda2e66fa26f148d6c21959bb08f923 svn merge ^/branches/released . 2011-01-11T16:16:53+00:00 marha marha@users.sourceforge.net 2011-01-11T16:16:53+00:00 urn:sha1:0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 xkeyboard-config git update 11 jan 2011 2011-01-11T16:10:31+00:00 marha marha@users.sourceforge.net 2011-01-11T16:10:31+00:00 urn:sha1:4613071e75e4828ce69ac1f17d73b0b7b6275578 Renamed xkbdata.src also on trunk since the current merging of subversion will loose all the changes in xkbdata.src when the directory is renamed on the source branch. 2010-07-13T07:48:55+00:00 marha marha@users.sourceforge.net 2010-07-13T07:48:55+00:00 urn:sha1:d8f81c980a46279ac619312a914b563144894512 Renamed xkbdata.src to xkeyboard-config (to reflect the name in the git repository) 2010-07-13T07:35:01+00:00 marha marha@users.sourceforge.net 2010-07-13T07:35:01+00:00 urn:sha1:81124070f120ab658e094b64f6944d701b003a99