Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 7 | -1635/+1616 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -1635/+1616 |
| | | | | | | | | 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-23 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 6 | -1215/+1269 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in | ||||
| * | libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011 | marha | 2011-05-29 | 6 | -1215/+1269 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 1 | -556/+554 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 1 | -556/+554 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 13 | -9628/+9583 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 13 | -9593/+9548 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 1 | -68/+68 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 1 | -68/+68 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 5 | -6/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 5 | -3520/+3514 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -809/+808 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -1105/+1104 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 1 | -9/+13 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 1 | -9/+13 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 2 | -21/+20 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 2 | -2203/+2202 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 5 | -12/+40 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 5 | -3988/+4016 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 2 | -2/+2 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 2 | -1825/+1825 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 3 | -108/+6 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 3 | -4013/+3911 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 3 | -8/+8 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 3 | -2015/+2015 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-17 | 1 | -2478/+2485 |
|\| | |||||
| * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 1 | -3/+10 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 11 | -2324/+2307 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 11 | -5964/+5947 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 5 | -10/+12 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 5 | -3105/+3107 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 7 | -1342/+1412 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 7 | -3490/+3560 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 1 | -1/+2 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 1 | -29/+30 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-25 | 10 | -1206/+781 |
|\| | |||||
| * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 10 | -11173/+10748 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 9 | -5656/+5646 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 9 | -5656/+5646 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-03 | 6 | -4739/+4733 |
|\| | |||||
| * | libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 | marha | 2011-02-03 | 6 | -4739/+4733 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 2 | -1/+2 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 2 | -1/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-19 | 17 | -3747/+3690 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 17 | -3747/+3690 |
| | |