Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 5 | -159/+156 |
|\ | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-11-25 | 5 | -159/+156 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 1 | -6/+1 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 1 | -6/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -5/+0 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 1 | -5/+0 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 17 | -8346/+8135 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c | ||||
| * | libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 | marha | 2011-09-22 | 17 | -8330/+8119 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 13 | -11438/+11438 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 1 | -1/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-07-04 | 1 | -1/+8 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 1 | -5/+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 Juli | marha | 2011-07-01 | 1 | -5/+6 |
| | | | | | | | | 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -2/+3 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -2/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -6/+1 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -6/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -1/+1 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-07 | 1 | -4/+5 |
|\| | |||||
| * | xserver pixman mesa git update 7 Apr 2011 | marha | 2011-04-07 | 1 | -4/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 2 | -5/+2 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 2 | -954/+951 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 6 | -45/+46 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 6 | -5802/+5803 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 5 | -28/+26 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 5 | -3602/+3600 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 3 | -320/+16 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 3 | -1372/+1068 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-03 | 2 | -779/+776 |
|\| | |||||
| * | libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 | marha | 2011-02-03 | 2 | -779/+776 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 3 | -2903/+2929 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 3 | -2899/+2925 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-23 | 2 | -3620/+3650 |
|\| | |||||
| * | xserver libX11 libXdmcp pixman git update 22-12-2010 | marha | 2010-12-22 | 1 | -751/+751 |
| | | |||||
| * | xserver libXext git update 20-12-2010 | marha | 2010-12-20 | 1 | -2865/+2895 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 5 | -378/+896 |
|\| | |||||
| * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 4 | -377/+895 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 3 | -1/+18 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 2 | -0/+17 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 2 | -5/+7 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver git update 15/11/2010 | marha | 2010-11-15 | 1 | -1/+1 |
| | | |||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 1 | -4/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-05 | 1 | -4/+1 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-30 | 8 | -463/+345 |
|\| | |||||
| * | xserver libX11 xkeyboard-config git update 30/9/2010 | marha | 2010-09-30 | 8 | -463/+345 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -1/+0 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -1/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-18 | 1 | -95/+75 |
|\| | |||||
| * | libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010 | marha | 2010-08-18 | 1 | -95/+75 |
| | |