Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-10-08 | 12 | -83/+61 |
|\ | | | | | | | | | | | | | | | | | | | | | * 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 2012 | marha | 2012-10-08 | 12 | -83/+61 |
| | | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-04 | 29 | -123/+183 |
|\| | | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012 | ||||
| * | randrproto mesa pixman git update 4 oct 2012 | marha | 2012-10-04 | 29 | -123/+183 |
| | | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 38 | -859/+1677 |
|\| | | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore | ||||
| * | libxcb mesa pixman xkeyboard-config git update 1 oct 2012 | marha | 2012-10-01 | 38 | -859/+1677 |
| | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-27 | 17 | -683/+541 |
|\| | | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012 | ||||
| * | mesa xserver pixman xkeyboard-config git update 27 sep 2012 | marha | 2012-09-27 | 17 | -683/+541 |
| | | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 19 | -521/+254 |
|\| | | | | | | | | | | | | | | | | | * 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 2012 | marha | 2012-09-24 | 19 | -521/+254 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-20 | 97 | -1768/+2422 |
|\| | | | | | | | | | | | | | | | * 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 2012 | marha | 2012-09-20 | 97 | -1768/+2422 |
| | | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9 | ||||
* | | Added -p option to bison command lines to avoid link problems | marha | 2012-09-18 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-18 | 15 | -3971/+403 |
|\| | |||||
| * | mesa git update 18 sep 2012 | marha | 2012-09-18 | 15 | -3971/+403 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 132 | -1704/+226 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 132 | -1704/+226 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 15 | -99/+213 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 15 | -99/+213 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 84 | -354/+288 |
|\| | |||||
| * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 84 | -354/+288 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-05 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver mesa git update 4 sep 2012 | marha | 2012-09-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-04 | 15 | -93/+73 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/eval.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/macros.h | ||||
| * | mesa git update 4 sep 2012 | marha | 2012-09-04 | 15 | -93/+73 |
| | | |||||
| * | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-03 | 261 | -58609/+321 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 60 | -2006/+1806 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-08-28 | 5 | -10/+122 |
| | | |||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 59 | -1972/+1682 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-04 | 261 | -58609/+321 |
| | | |||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 60 | -2006/+1806 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-09-04 | 5 | -10/+122 |
| | | |||||
* | | mesa: | marha | 2012-09-04 | 2 | -4/+4 |
| | | | | | | | | | | - Added texcompress_cpal.c - Removed dlopen.c | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 59 | -1972/+1682 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-22 | 1 | -30/+2 |
|\| | |||||
| * | mesa xserver git update 22 Aug 2012 | marha | 2012-08-22 | 1 | -30/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 12 | -432/+1798 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 12 | -432/+1798 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-17 | 15 | -146/+130 |
|\| | |||||
| * | fontconfig mesa git update 17 Aug 2012 | marha | 2012-08-17 | 15 | -146/+130 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 54 | -487/+2169 |
|\| | |||||
| * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 55 | -513/+3182 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 50 | -233/+825 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 50 | -233/+825 |
| | | |||||
* | | synchronised files | marha | 2012-08-07 | 1 | -26/+1013 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 20 | -259/+499 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h | ||||
| * | mesa xserver xkeyboard-config git update 7 Aug 2012 | marha | 2012-08-07 | 20 | -259/+499 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 34 | -459/+613 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 34 | -459/+613 |
| | | |||||
* | | Solved compile errors | marha | 2012-08-01 | 2 | -0/+4 |
| | |