vcxsrv/mesalib/src/glsl/glsl_parser_extras.cpp, 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
Merge remote-tracking branch 'origin/released'
2011-06-05T14:04:18+00:00
marha
marha@users.sourceforge.net
2011-06-05T14:04:18+00:00
urn:sha1:097c0d8400d976c5c372db576a11764e87994c7f
Conflicts:
libX11/specs/i18n/trans/trans.xml
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_print_visitor.cpp
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/rules/xkb.dtd
xorg-server/xkeyboard-config/symbols/de
libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011
2011-06-05T14:00:23+00:00
marha
marha@users.sourceforge.net
2011-06-05T14:00:23+00:00
urn:sha1:0e1ac54142d49051da9a74f37a792225a4e8d7b0
svn merge ^/branches/released .
2011-05-10T13:36:25+00:00
marha
marha@users.sourceforge.net
2011-05-10T13:36:25+00:00
urn:sha1:2e5094b5a8e6241621cbf8c3e41b618347de7e2f
libfontenc pixman mesa git update 10 May 2011
2011-05-10T13:17:13+00:00
marha
marha@users.sourceforge.net
2011-05-10T13:17:13+00:00
urn:sha1:0f6aea154580c2f220be98d12108dd7d316c21f6
svn merge ^/branches/released .
2011-05-03T15:37:14+00:00
marha
marha@users.sourceforge.net
2011-05-03T15:37:14+00:00
urn:sha1:e4bd55e182560fa87af77ee3ec49fc1a907ead85
xkeyboard libxcb pixman mesa git update 2 May 2011
2011-05-03T12:48:26+00:00
marha
marha@users.sourceforge.net
2011-05-03T12:48:26+00:00
urn:sha1:cc93496bdbb3e7aea51033ece75fa85cfb5845d4
svn merge ^/branches/released .
2011-04-14T08:39:30+00:00
marha
marha@users.sourceforge.net
2011-04-14T08:39:30+00:00
urn:sha1:898081f31f99dc35a1602a607a07d1aaff49ac40
server xkeyboard-config mesa git update 14 Apr 2011
2011-04-14T06:41:54+00:00
marha
marha@users.sourceforge.net
2011-04-14T06:41:54+00:00
urn:sha1:019fc27ce6dc2a1809107be10d4deb80e0fa436b