aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-10-056-28/+13
|\ | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-056-28/+13
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-2710-514/+558
|\| | | | | | | | | | | | | | | | | 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-2710-514/+558
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-227-213/+182
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-227-213/+182
| |
* | Synchronised line endinge with release branchmarha2011-09-1212-13581/+13581
| |
* | 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-041-0/+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-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-292-1/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-1/+22
| |
* | merge ^/branches/released .marha2011-05-241-1/+1
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-164-196/+166
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-164-42/+12
| |
* | svn merge ^/branches/released .marha2011-04-273-775/+759
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-273-775/+759
| |
* | svn merge ^/branches/released .marha2011-04-141-1/+8
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-2183/+2190
| |
* | svn merge ^/branches/released .marha2011-04-053-10/+27
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-053-1506/+1523
| |
* | svn merge ^/branches/released .marha2011-03-282-104/+6
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-282-1511/+1413
| |
* | svn merge ^/branches/released .marha2011-03-202-3/+3
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-202-1380/+1380
| |
* | svn merge ^/branches/released .marha2011-03-152-2171/+2171
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-152-2171/+2171
| |
* | svn merge ^/branches/released .marha2011-03-103-4/+6
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-103-1381/+1383
| |
* | svn merge ^/branches/released .marha2011-03-043-904/+950
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-043-3003/+3049
| |
* | svn merge ^/branches/released .marha2011-02-253-218/+214
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-253-2767/+2763
| |
* | svn merge ^/branches/released .marha2011-02-205-1586/+1629
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-205-1586/+1629
| |
* | svn merge ^/branches/released .marha2011-02-033-1455/+1447
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-033-1455/+1447
| |
* | svn merge ^/branches/released .marha2011-01-084-5/+6
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-084-5/+6
| |
* | svn merge ^/branches/released .marha2010-12-2313-8243/+7997
|\|
| * xserver libX11 libXdmcp pixman git update 22-12-2010marha2010-12-2213-8243/+7997
| |
* | svn merge ^/branches/released .marha2010-12-162-2287/+2294
|\|
| * xserver libXdmcp git update 16-12-2010marha2010-12-162-2287/+2294
| |
* | svn merge ^/branches/released .marha2010-12-1210-58/+39
|\|
| * xserver git update 10/12/2010marha2010-12-1010-58/+39
| |
* | svn merge ^/branches/released .marha2010-12-0812-489/+564
|\|
| * xserver pixman git update 7-12-2010marha2010-12-078-17/+32
| |
| * libXext xserver pixman git update 6-12-2010marha2010-12-064-472/+532
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 06:08:14 +0000