vcxsrv/xorg-server/glx/glxscreens.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
Solved mistake in latest merge
2010-12-01T20:21:30+00:00
marha
marha@users.sourceforge.net
2010-12-01T20:21:30+00:00
urn:sha1:fea28ce54ffbea6eda28791518ccca0e0df2df0d
svn merge ^/branches/released .
2010-12-01T08:14:05+00:00
marha
marha@users.sourceforge.net
2010-12-01T08:14:05+00:00
urn:sha1:6cbbd31fd2f24fdda51df2de8a8f62ec83b5db03
xserver libX11 libxcb update 1/12/2010
2010-12-01T06:54:34+00:00
marha
marha@users.sourceforge.net
2010-12-01T06:54:34+00:00
urn:sha1:30eaf03aef5847adb6da7efd4bbf4a4abaf5d738
include unistd.h where strdup is used.
2010-06-20T14:26:02+00:00
marha
marha@users.sourceforge.net
2010-06-20T14:26:02+00:00
urn:sha1:613f796c5d7850df96930ca94fa662191ce4d382
svn merge ^/branches/released .
2010-06-16T07:38:57+00:00
marha
marha@users.sourceforge.net
2010-06-16T07:38:57+00:00
urn:sha1:4d5476d24bec19c71aced4ac2b320d1110fb5363
xserver and libxcb git update 11/6/2010
2010-06-16T07:28:49+00:00
marha
marha@users.sourceforge.net
2010-06-16T07:28:49+00:00
urn:sha1:2a31e38d82566c4f93773ecf9c79f2cc9abef169
Solved compiler warnings
2010-06-14T15:17:24+00:00
marha
marha@users.sourceforge.net
2010-06-14T15:17:24+00:00
urn:sha1:1ceae771f1f16ef36c5083f5e678959b3b490c8f
svn merge ^/branches/released .
2010-06-14T13:15:50+00:00
marha
marha@users.sourceforge.net
2010-06-14T13:15:50+00:00
urn:sha1:e2eb44705a8e4886d81b75c12e68aaebe9946439