Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-10-22 | 7 | -61/+143 |
|\ | | | | | | | | | * origin/released: libX11 mesa pixman git update 22 oct 2012 | ||||
| * | libX11 mesa pixman git update 22 oct 2012 | marha | 2012-10-22 | 7 | -61/+143 |
| | | | | | | | | | | | | libX11: f2a8def423a46d52e834cf7ea49fa0079427663a mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6 pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-17 | 2 | -4/+14 |
|\| | | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012 | ||||
| * | pixman mesa git update 17 oct 2012 | marha | 2012-10-17 | 2 | -4/+14 |
| | | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-15 | 2 | -40/+16 |
|\| | | | | | | | | | | | | | | | * origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c | ||||
| * | xserver mesa pixman git update 15 oct 2012 | marha | 2012-10-15 | 2 | -40/+16 |
| | | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28 | ||||
* | | Synchronised with Makefile.sources | marha | 2012-10-08 | 1 | -22/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-08 | 29 | -1416/+2573 |
|\| | | | | | | | | | | | | | | | | | | | | | * 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 | 29 | -1416/+2573 |
| | | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-04 | 8 | -33/+33 |
|\| | | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012 | ||||
| * | randrproto mesa pixman git update 4 oct 2012 | marha | 2012-10-04 | 8 | -33/+33 |
| | | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 2 | -2/+4 |
|\| | | | | | | | | | | | | | | | * 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 | 2 | -2/+4 |
| | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-27 | 16 | -127/+947 |
|\| | | | | | | | | | * 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 | 16 | -127/+947 |
| | | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 13 | -593/+388 |
|\| | | | | | | | | | | | | | | | | | * 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 | 13 | -593/+388 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-20 | 3 | -31/+16 |
|\| | | | | | | | | | | | | | | | * 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 | 3 | -31/+16 |
| | | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 5 | -14/+21 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 5 | -23/+32 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -17/+15 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -271/+0 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -17/+15 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -271/+0 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 1 | -4/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 1 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 7 | -26/+163 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 7 | -26/+163 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 6 | -5/+14 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 6 | -5/+14 |
| | | |||||
* | | Solved compile errors | marha | 2012-08-01 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 14 | -19/+476 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 14 | -19/+476 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 2 | -193/+157 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 2 | -193/+157 |
| | | |||||
* | | synchronised pixman/pixman/makefile pixman/pixman/makefile.sources | marha | 2012-07-09 | 1 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 17 | -845/+1724 |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h | ||||
| * | fontconfig libX11 mesa pixman xserver git update 9 Jul 2012 | marha | 2012-07-09 | 17 | -845/+1724 |
| | | |||||
* | | Solved compilation warnings introduced in latest merge | marha | 2012-07-02 | 1 | -0/+1 |
| | | |||||
* | | Solved compilation errors due to latest merge | marha | 2012-07-02 | 1 | -12/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-02 | 12 | -183/+645 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c | ||||
| * | mesa pixman xserver git update 2 Jul 2012 | marha | 2012-07-02 | 12 | -183/+645 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 3 | -12/+72 |
|\| | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c | ||||
| * | xkeyboard-config xserver pixman mesa git update 29 Jun 2012 | marha | 2012-06-29 | 3 | -12/+72 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 1 | -1/+5 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 1 | -1/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 2 | -0/+85 |
|\| | |||||
| * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 2 | -0/+85 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h |