aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-182-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1812-373/+403
|\|
| * mesa git update 18 sep 2012marha2012-09-1812-373/+403
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-17131-1686/+202
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-17131-1686/+202
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1412-85/+198
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-1412-85/+198
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0683-353/+288
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-0683-353/+288
| |
* | 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-0415-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 2012marha2012-09-0415-93/+73
| |
| * mesa xkeyboard-config git update 3 sep 2012marha2012-09-03245-58013/+225
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3153-1978/+1757
| | | | | | | | git update 31 Aug 2012
| * fontconfig mesa xserver git update 28 Aug 2012marha2012-08-285-10/+122
| |
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-2753-1814/+1589
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | mesa xkeyboard-config git update 3 sep 2012marha2012-09-04245-58013/+225
| |
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-0453-1978/+1757
| | | | | | | | git update 31 Aug 2012
* | fontconfig mesa xserver git update 28 Aug 2012marha2012-09-045-10/+122
| |
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-0453-1814/+1589
| | | | | | | | 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-2112-432/+1798
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-2112-432/+1798
| |
* | 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-1645-474/+2143
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-1645-474/+2143
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1346-229/+819
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-1346-229/+819
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0716-243/+320
|\| | | | | | | | | | | | | | | | | | | | | 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-0716-243/+320
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0332-440/+601
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-0332-440/+601
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0113-77/+430
|\|
| * git mesa update 1 Aug 2012marha2012-08-0113-77/+430
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-31113-2360/+3698
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-31113-2360/+3698
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1811-32/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1811-32/+109
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1616-286/+329
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-1616-286/+329
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1339-286/+1222
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1339-286/+1222
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-124-79/+103
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-124-79/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-119-10/+159
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c