aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-11-071-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-051-1/+1
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Merge remote-tracking branch 'origin/released'marha2012-10-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
| * fontconfig xserver mesa git update 30 oct 2012marha2012-10-301-1/+1
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Merge remote-tracking branch 'origin/released'marha2012-10-151-1/+2
|\| | | | | | | | | | | | | | | * origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c
| * xserver mesa pixman git update 15 oct 2012marha2012-10-151-1/+2
| | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
* | Merge remote-tracking branch 'origin/released'marha2012-10-093-1/+11
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-093-1/+11
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
* | Merge remote-tracking branch 'origin/released'marha2012-10-085-7/+7
|\| | | | | | | | | | | | | | | | | | | | | * origin/released: pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012 Conflicts: xorg-server/Xext/xf86bigfont.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012marha2012-10-085-7/+7
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-09-245-54/+17
|\| | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c
| * mesa pixman xserver git update 24 sep 2012marha2012-09-245-54/+17
| | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88
* | Merge remote-tracking branch 'origin/released'marha2012-09-202-1/+9
|\| | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c
| * libxcb xserver pixman mesa git update 20 sep 2012marha2012-09-202-1/+9
| | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
* | Merge remote-tracking branch 'origin/released'marha2012-09-051-0/+11
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver mesa git update 4 sep 2012marha2012-09-051-0/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-211-1/+1
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-211-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-311-43/+0
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-311-43/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-181-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
| * fontconfig mesa xserver git update 18 Jul 2012marha2012-07-181-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-131-0/+1
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-131-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-121-0/+2
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-121-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1118-132/+3910
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-1018-132/+3910
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0917-45/+806
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0917-45/+806
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-065-25/+23
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-065-25/+23
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-043-11/+11
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-043-11/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-0/+17
|\| | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-151-0/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0828-416/+401
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-0828-416/+401
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-291-16/+78
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-291-16/+78
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2518-55/+109
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2518-55/+109
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-152-3/+0
|\|
| * xserver mesa git update 15 May 2012marha2012-05-152-3/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-202-0/+12
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-202-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1616-380/+381
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h
| * libX11 xserver pixman mesa git update 16 Apr 2012marha2012-04-1616-380/+381
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-291-1/+1
|\|
| * xserver fontconfig mesa git update 29 Mar 2012marha2012-03-291-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 14:07:09 +0000