aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-10-0811-82/+60
|\ | | | | | | | | | | | | | | | | | | | | * 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-0811-82/+60
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-0412-41/+53
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-0412-41/+53
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
* | Merge remote-tracking branch 'origin/released'marha2012-10-0122-612/+676
|\| | | | | | | | | | | | | | | * 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 2012marha2012-10-0122-612/+676
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-2715-506/+423
|\| | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
| * mesa xserver pixman xkeyboard-config git update 27 sep 2012marha2012-09-2715-506/+423
| | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01
* | Merge remote-tracking branch 'origin/released'marha2012-09-245-63/+103
|\| | | | | | | | | | | | | | | | | * 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-63/+103
| | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88
* | Merge remote-tracking branch 'origin/released'marha2012-09-202-2/+17
|\| | | | | | | | | | | | | | | * 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-2/+17
| | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
* | Added -p option to bison command lines to avoid link problemsmarha2012-09-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1811-372/+402
|\|
| * mesa git update 18 sep 2012marha2012-09-1811-372/+402
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-17121-1669/+193
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-17121-1669/+193
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-148-80/+160
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-148-80/+160
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0672-332/+272
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-0672-332/+272
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-051-1/+1
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver mesa git update 4 sep 2012marha2012-09-051-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0413-91/+65
|\| | | | | | | | | | | | | | | | | | | 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 2012marha2012-09-0413-91/+65
| |
| * mesa xkeyboard-config git update 3 sep 2012marha2012-09-0338-241/+222
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3147-1961/+1703
| | | | | | | | git update 31 Aug 2012
| * fontconfig mesa xserver git update 28 Aug 2012marha2012-08-281-0/+10
| |
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-2748-1803/+1574
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | mesa xkeyboard-config git update 3 sep 2012marha2012-09-0438-241/+222
| |
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-0447-1961/+1703
| | | | | | | | git update 31 Aug 2012
* | fontconfig mesa xserver git update 28 Aug 2012marha2012-09-041-0/+10
| |
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-0448-1803/+1574
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-221-30/+2
|\|
| * mesa xserver git update 22 Aug 2012marha2012-08-221-30/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-2111-428/+1795
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-2111-428/+1795
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1711-48/+71
|\|
| * fontconfig mesa git update 17 Aug 2012marha2012-08-1711-48/+71
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1631-337/+1623
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-1631-337/+1623
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1331-188/+245
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-1331-188/+245
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0710-141/+159
|\| | | | | | | | | | | | | | | | | | | | | 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 2012marha2012-08-0710-141/+159
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0329-440/+594
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-0329-440/+594
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-016-18/+261
|\|
| * git mesa update 1 Aug 2012marha2012-08-016-18/+261
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3191-2316/+2966
|\|