Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-12-12 | 4 | -3/+7 |
|\ | | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012 | ||||
| * | fontconfig mesa pixman xkeyboard-config git update 12 dev 2012 | marha | 2012-12-12 | 4 | -3/+7 |
| | | | | | | | | | | | | | | fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-12-10 | 7 | -25/+75 |
|\| | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c | ||||
| * | fontconfig libX11 mesa pixman git update 10 dec 2012 | marha | 2012-12-10 | 7 | -25/+75 |
| | | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019 | ||||
* | | Added missing file | marha | 2012-11-29 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-11-29 | 2 | -9/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 29 nov 2012 Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwindow.h xorg-server/os/osinit.c xorg-server/os/utils.c | ||||
| * | fontconfig xserver mesa git update 29 nov 2012 | marha | 2012-11-29 | 2 | -9/+11 |
| | | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-11-19 | 3 | -21/+210 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c | ||||
| * | git update 19 nov 2012 | marha | 2012-11-19 | 3 | -21/+210 |
| | | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-09 | 1 | -0/+4 |
|\| | | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | ||||
| * | fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | marha | 2012-10-09 | 1 | -0/+4 |
| | | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450 | ||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-17 | 1 | -2/+2 |
|\| | |||||
| * | fontconfig mesa git update 17 Aug 2012 | marha | 2012-08-17 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 2012 | marha | 2012-07-10 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 1 | -3/+13 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 1 | -3/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 1 | -2/+12 |
|\| | |||||
| * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 1 | -2/+12 |
| | | |||||
* | | Solved compilation error in fontconfig | marha | 2012-06-15 | 1 | -3/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 7 | -34/+41 |
|\| | | | | | | | | | | | | | | | 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 2012 | marha | 2012-06-15 | 7 | -34/+43 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 4 | -6/+7 |
|\| | |||||
| * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 4 | -9/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 6 | -74/+273 |
|\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 6 | -74/+273 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 6 | -19/+70 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 6 | -19/+70 |
| | | | | | | | | May 2012 | ||||
* | | fontconfig: solved compile warnings and link errors. | marha | 2012-05-29 | 3 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 6 | -150/+349 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 29 May 2012 | marha | 2012-05-29 | 6 | -150/+349 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 1 | -0/+5 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 1 | -0/+5 |
| | | |||||
* | | Solved compilation errors | marha | 2012-05-25 | 1 | -3/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 5 | -129/+329 |
|\| | |||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 5 | -129/+329 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 5 | -27/+69 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 5 | -27/+69 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 1 | -2/+0 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 4 | -26/+67 |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 4 | -26/+67 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 6 | -29/+249 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c | ||||
| * | fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 | marha | 2012-04-30 | 6 | -29/+249 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-23 | 4 | -2/+90 |
|\| | |||||
| * | fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012 | marha | 2012-04-23 | 4 | -2/+90 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 2 | -0/+93 |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 20 april 2012 | marha | 2012-04-20 | 2 | -0/+93 |
| | |