aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-251-3/+3
|\ | | | | | | | | | | | | | | | | | | 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 2011marha2011-11-251-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-041-3/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-041-3/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-36/+152
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-36/+152
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-192-26/+37
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-192-26/+37
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-276-2624/+2632
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-276-2615/+2623
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-223-5790/+5790
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011marha2011-09-223-5782/+5782
| |
* | Synchronised line endinge with release branchmarha2011-09-127-3397/+3397
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-041-697/+701
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/mesa/program/ir_to_mesa.cpp xorg-server/composite/compalloc.c xorg-server/configure.ac xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Makefile.am xorg-server/hw/xquartz/xpr/xprFrame.c xorg-server/include/windowstr.h
| * randrproto mesa xserver git update 4 aug 2011marha2011-08-041-697/+701
| |
* | Solved possible crash because of invalid valdata pointersmarha2011-07-152-5/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-291-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-0/+1
| |
* | merge ^/branches/released .marha2011-05-231-8/+8
|\|
| * xserver git update 23 May 2011marha2011-05-231-8/+8
| |
* | merge ^/branches/released .marha2011-05-162-46/+17
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-162-45/+17
| |
* | svn merge ^/branches/released .marha2011-04-055-12/+9
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-055-2279/+2276
| |
* | svn merge ^/branches/released .marha2011-03-153-23/+31
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-153-1733/+1741
| |
* | svn merge ^/branches/released .marha2011-03-045-122/+223
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-045-2722/+2823
| |
* | svn merge ^/branches/released .marha2011-01-211-2/+0
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-2/+0
| |
* | svn merge ^/branches/released .marha2011-01-082-51/+77
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-082-51/+77
| |
* | svn merge ^/branches/released .marha2010-12-121-1/+1
|\|
| * xserver git update 10/12/2010marha2010-12-101-1/+1
| |
* | svn merge ^/branches/released .marha2010-12-081-1/+8
|\|
| * xserver pixman git update 7-12-2010marha2010-12-071-1/+8
| |
* | svn merge ^/branches/released .marha2010-12-018-244/+117
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-017-243/+117
| |
* | svn merge "^/branches/released" .marha2010-11-153-3/+7
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-143-3/+7
| |
* | svn merge ^/branches/released .marha2010-09-271-23/+19
|\|
| * xserver xkbcomp libxcb pixman git update 24/9/2010marha2010-09-241-23/+19
| |
* | svn merge ^/branches/released .marha2010-09-141-2/+0
|\|
| * xserver libX11 pixman git update 14/9/2010marha2010-09-141-2/+0
| |
* | svn merge ^/branches/released .marha2010-09-111-4/+1
|\|
| * xserver git update 11/9/2010marha2010-09-111-4/+1
| |
* | svn merge ^/branches/released .marha2010-07-101-1/+1
|\|
| * git update 10/7/2010marha2010-07-101-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 17:12:56 +0000