aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/configure.ac
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-011-14/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Julimarha2011-07-011-14/+6
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-231-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
| * libX11 mesa pixman xserver git update 23 June 2011marha2011-06-231-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-201-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-201-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-8/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-031-8/+6
| |
* | merge ^/branches/released .marha2011-05-161-10/+8
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-2249/+2247
|/
* xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-2234/+2249
|
* xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-7/+10
|
* xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-7/+9
|
* xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-2226/+2229
|
* xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-54/+9
|
* xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-2271/+2271
|
* xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-28/+18
|
* xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-2/+5
|
* xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-251-2278/+2278
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-2278/+2278
|
* libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-3/+8
|
* xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-2/+2
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-191-1/+10
|
* xserver libX11 libXdmcp pixman git update 22-12-2010marha2010-12-221-1/+0
|
* xserver libXdmcp git update 16-12-2010marha2010-12-161-2270/+2265
|
* xserver git update 10/12/2010marha2010-12-101-2/+2
|
* xserver pixman git update 7-12-2010marha2010-12-071-15/+16
|
* libXext xserver pixman git update 6-12-2010marha2010-12-061-2/+2
|
* xserver libX11 libxcb update 1/12/2010marha2010-12-011-3/+1
|
* xserver pixman libX11 libXext 14/11/2010marha2010-11-141-0/+1
|
* xserver update 19/10/2010marha2010-10-191-2/+5
|
* xserver xkeyboard-config update 2/10/2010marha2010-10-021-3/+2
|
* xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-4/+2
|
* xserver git update 13/9/2010marha2010-09-131-1/+1
|
* xserver xkeyboard-config git update 21/8/2010marha2010-08-221-2/+2
|
* libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-2/+2
|
* xserver libX11 libXdmcp git update 2-8-2010marha2010-08-021-3/+5
|
* xserver libX11 git update 20/7/2010marha2010-07-201-2/+2
|
* git update 2/7/2010marha2010-07-021-2/+2
|
* git update 1/7/2010marha2010-07-011-0/+3
|
* git update 25/6/2010marha2010-06-251-8/+8
|
* xserver git update 23/6/2010marha2010-06-231-3/+10
|
* xserver and libxcb git update 11/6/2010marha2010-06-161-2/+2
|
* xserver git update 11/6/2010marha2010-06-111-7/+16
|
* xserver git update 21/5/2010marha2010-05-211-2247/+2249
|
* xserver git update 18/10/2010marha2010-05-181-2248/+2247
|
* xserver git update 15/5/2010marha2010-05-151-2246/+2248
|
* xserver git update 4/5/2010marha2010-05-041-2240/+2246
|
* Git update 28/4/2010marha2010-04-281-2239/+2240
|
* git update 22/4/2010marha2010-04-221-7/+0
|