aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-08-018-144/+170
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv
| * mesa xserver pixman xkeyboard-config git update 1 aug 2011marha2011-08-018-144/+170
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-047-822/+839
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-047-822/+839
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-017-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 Julimarha2011-07-017-1635/+1616
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-231-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 2011marha2011-06-231-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-296-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 2011marha2011-05-296-1215/+1269
| |
* | merge ^/branches/released .marha2011-05-241-1/+1
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-221-556/+554
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-556/+554
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-1613-9628/+9583
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1613-9593/+9548
| |
* | svn merge ^/branches/released .marha2011-04-301-68/+68
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-68/+68
| |
* | svn merge ^/branches/released .marha2011-04-285-6/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-285-3520/+3514
| |
* | svn merge ^/branches/released .marha2011-04-274-809/+808
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-274-1105/+1104
| |
* | svn merge ^/branches/released .marha2011-04-151-9/+13
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-9/+13
| |
* | svn merge ^/branches/released .marha2011-04-142-21/+20
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-142-2203/+2202
| |
* | svn merge ^/branches/released .marha2011-04-055-12/+40
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-055-3988/+4016
| |
* | svn merge ^/branches/released .marha2011-03-302-2/+2
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-302-1825/+1825
| |
* | svn merge ^/branches/released .marha2011-03-283-108/+6
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-283-4013/+3911
| |
* | svn merge ^/branches/released .marha2011-03-203-8/+8
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-203-2015/+2015
| |
* | svn merge ^/branches/released .marha2011-03-171-2478/+2485
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-3/+10
| |
* | svn merge ^/branches/released .marha2011-03-1511-2324/+2307
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-1511-5964/+5947
| |
* | svn merge ^/branches/released .marha2011-03-105-10/+12
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-105-3105/+3107
| |
* | svn merge ^/branches/released .marha2011-03-047-1342/+1412
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-047-3490/+3560
| |
* | svn merge ^/branches/released .marha2011-02-281-1/+2
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-29/+30
| |
* | svn merge ^/branches/released .marha2011-02-2510-1206/+781
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-2510-11173/+10748
| |
* | svn merge ^/branches/released .marha2011-02-209-5656/+5646
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-209-5656/+5646
| |
* | svn merge ^/branches/released .marha2011-02-036-4739/+4733
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-036-4739/+4733
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 14:49:50 +0000