aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/exa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-251-1256/+1256
|\ | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-251-1256/+1256
| |
* | Synchronised line endinge with release branchmarha2011-09-122-1488/+1488
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-291-10/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c libX11/configure.ac libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH12.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml libxcb/configure.ac libxcb/src/c_client.py libxcb/src/xcb_auth.c libxcb/src/xcb_util.c mesalib/common.py mesalib/configs/linux-dri mesalib/docs/GL3.txt mesalib/docs/download.html mesalib/docs/install.html mesalib/include/GL/internal/dri_interface.h mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp-parse.y 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_clone.cpp mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/glsl/opt_tree_grafting.cpp mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_XML.py mesalib/src/mapi/glapi/gen/gl_table.py 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/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mapi/mapi/u_thread.c mesalib/src/mapi/mapi/u_thread.h mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c mesalib/src/mesa/main/api_arrayelt.c mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pbo.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shared.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/program/register_allocate.c mesalib/src/mesa/program/register_allocate.h mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/tnl/t_draw.c mesalib/src/mesa/vbo/vbo_exec_array.c mesalib/src/mesa/vbo/vbo_save_api.c pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-inlines.h pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h xorg-server/configure.ac xorg-server/fb/fbblt.c xorg-server/hw/xquartz/darwin.c xorg-server/xkeyboard-config/symbols/de
| * xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29marha2011-08-291-10/+13
| | | | | | | | aug 2011
* | Merge remote-tracking branch 'origin/released'marha2011-07-048-3097/+3097
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-048-3097/+3097
| |
* | 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
| |
* | svn merge ^/branches/released .marha2011-04-281-4/+3
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-765/+764
| |
* | svn merge ^/branches/released .marha2011-03-291-4/+3
|\|
| * xserver fontconfig mesa git update 29 Mar 2011marha2011-03-291-725/+724
| |
* | svn merge ^/branches/released .marha2011-03-206-13/+13
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-206-2611/+2611
| |
* | svn merge ^/branches/released .marha2011-03-106-1078/+1078
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-106-999/+999
| |
* | svn merge ^/branches/released .marha2011-02-251-4/+5
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-251-289/+290
| |
* | svn merge ^/branches/released .marha2011-02-211-270/+261
|\|
| * xserver xkeyboard-config mesa git update 21 Feb 2011marha2011-02-211-13/+4
| |
* | svn merge ^/branches/released .marha2011-02-033-1385/+1397
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-033-1385/+1397
| |
* | svn merge ^/branches/released .marha2011-01-082-3/+4
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-082-3/+4
| |
* | svn merge ^/branches/released .marha2010-12-252-0/+4
|\|
| * xorg-server libx11 libxcb git update 24/12/2010marha2010-12-242-0/+4
| |
* | svn merge "^/branches/released" .marha2010-11-151-2/+1
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-2/+1
| |
* | svn merge ^/branches/released .marha2010-07-145-232/+252
|\|
| * xserver libxcb git update 14/7/2010marha2010-07-145-232/+252
| |
* | svn merge ^/branches/released .marha2010-06-142-9/+6
|\|
| * xserver git update 14/6/2010marha2010-06-142-9/+6
| |
* | svn merge ^/branches/released .marha2010-06-118-1928/+1934
|\|
| * xserver git update 11/6/2010marha2010-06-118-2643/+2649
| |
* | svn merge ^/branches/released .marha2010-05-223-708/+744
|\|
| * xserver git update 21/5/2010marha2010-05-213-1448/+1484
| |
| * xserver git update 15/5/2010marha2010-05-154-3996/+3996
| |
| * Removed files not in the git repositorymarha2010-04-281-770/+0
| |
| * git update 27/4/2010marha2010-04-271-3/+5
| |
| * git update 22/4/2010marha2010-04-227-39/+12
| |
| * Git update 15/4/2010marha2010-04-151-1/+1
| |
| * Updated to following packages:marha2010-04-021-0/+2
| | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0
| * Updated to xorg-server-1.7.99.902marha2010-03-222-2/+5
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-164-2701/+2701
| |
* | svn merge -r554:HEAD "^/branches/released" .marha2010-04-281-770/+0
| |
* | svn merge -r549:HEAD "^/branches/released" .marha2010-04-271-3/+5
| |
* | svn merge -r541:HEAD "^/branches/released" .marha2010-04-227-39/+12
| |
* | svn merge -r530:HEAD "^/branches/released" .marha2010-04-151-1/+1
| |
* | svn merge -r522:HEAD ^/branches/released .marha2010-04-021-0/+2
| |