aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-119-10/+159
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-118-67/+205
|\| | | | | | | | | | | | | | | | | | | | | 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 2012marha2012-07-108-67/+205
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-068-31/+19
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-068-31/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-049-46/+76
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-049-46/+76
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0213-243/+252
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0213-243/+252
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2910-60/+107
|\| | | | | | | | | | | 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 2012marha2012-06-2910-60/+107
| |