aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-1211-9886/+9886
|
* Merge remote-tracking branch 'origin/released'marha2011-08-011-1029/+1029
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-1028/+1028
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-141-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 2011marha2011-07-141-1/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-042-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 2011marha2011-07-042-122/+120
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-012-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 Julimarha2011-07-012-6/+5
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-231-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 2011marha2011-06-231-13/+17
| |
* | merge ^/branches/released .marha2011-05-1611-1513/+1713
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1611-2467/+2667
| |
* | svn merge ^/branches/released .marha2011-04-271-3/+3
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-800/+800
| |
* | svn merge ^/branches/released .marha2011-03-301-317/+309
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-301-317/+309
| |
* | svn merge ^/branches/released .marha2011-03-243-1843/+1844
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-243-610/+611
| |
* | svn merge ^/branches/released .marha2011-03-202-3/+4
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-202-314/+315
| |
* | svn merge ^/branches/released .marha2011-03-154-104/+2
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-154-379/+277
| |
* | svn merge ^/branches/released .marha2011-03-102-4/+3
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-102-315/+314
| |
* | svn merge ^/branches/released .marha2011-02-282-274/+289
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-282-33/+48
| |
* | svn merge ^/branches/released .marha2011-02-254-106/+41
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-254-5597/+5532
| |
* | svn merge ^/branches/released .marha2011-01-214-3346/+3311
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-214-3346/+3311
| |
* | svn merge ^/branches/released .marha2011-01-198-43/+7
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-198-43/+7
| |
* | svn merge ^/branches/released .marha2011-01-081-1/+1
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-1/+1
| |
* | svn merge ^/branches/released .marha2010-12-162-382/+377
|\|
| * xserver libXdmcp git update 16-12-2010marha2010-12-162-382/+377
| |
* | svn merge ^/branches/released .marha2010-12-128-220/+300
|\|
| * xserver git update 10/12/2010marha2010-12-108-220/+300
| |
* | svn merge ^/branches/released .marha2010-12-082-4/+4
|\|
| * libXext xserver pixman git update 6-12-2010marha2010-12-062-4/+4
| |
* | svn merge ^/branches/released .marha2010-12-012-4/+0
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-012-4/+0
| |
* | svn merge ^/branches/released .marha2010-11-301-5/+3
|\|
| * libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010marha2010-11-261-5/+3
| |
* | svn merge "^/branches/released" .marha2010-11-157-849/+820
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-147-849/+820
| |
* | svn merge ^/branches/released .marha2010-09-301-44/+12
|\|
| * xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-44/+12
| |
* | svn merge ^/branches/released .marha2010-09-1412-766/+208
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 08:34:30 +0000