Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-14 | 1 | -1/+0 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c | ||||
| * | mesa xserver git update 14 july 2011 | marha | 2011-07-14 | 1 | -1/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 2 | -122/+120 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -122/+120 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 2 | -6/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -6/+5 |
| | | | | | | | | 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-23 | 1 | -13/+17 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-06-23 | 1 | -13/+17 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 11 | -1513/+1713 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 11 | -2467/+2667 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -3/+3 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -800/+800 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -317/+309 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -317/+309 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 3 | -1843/+1844 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 3 | -610/+611 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 2 | -3/+4 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 2 | -314/+315 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 4 | -104/+2 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 4 | -379/+277 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 2 | -4/+3 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 2 | -315/+314 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 2 | -274/+289 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 2 | -33/+48 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-25 | 4 | -106/+41 |
|\| | |||||
| * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 4 | -5597/+5532 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 4 | -3346/+3311 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 4 | -3346/+3311 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-19 | 8 | -43/+7 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 8 | -43/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-16 | 2 | -382/+377 |
|\| | |||||
| * | xserver libXdmcp git update 16-12-2010 | marha | 2010-12-16 | 2 | -382/+377 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 8 | -220/+300 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 8 | -220/+300 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 2 | -4/+4 |
|\| | |||||
| * | libXext xserver pixman git update 6-12-2010 | marha | 2010-12-06 | 2 | -4/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 2 | -4/+0 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 2 | -4/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-30 | 1 | -5/+3 |
|\| | |||||
| * | libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010 | marha | 2010-11-26 | 1 | -5/+3 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 7 | -849/+820 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 7 | -849/+820 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-30 | 1 | -44/+12 |
|\| | |||||
| * | xserver libX11 xkeyboard-config git update 30/9/2010 | marha | 2010-09-30 | 1 | -44/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-14 | 12 | -766/+208 |
|\| | |||||
| * | xserver libX11 pixman git update 14/9/2010 | marha | 2010-09-14 | 12 | -766/+208 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-07 | 1 | -294/+292 |
|\| | |||||
| * | git update 7/7/2010 | marha | 2010-07-07 | 1 | -294/+292 |
| | |