aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-09-1775-1176/+41
|\ | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-1775-1176/+41
| |
* | 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-0630-157/+132
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-0630-157/+132
| |
* | 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-047-82/+52
|\| | | | | | | | | | | | | | | | | | | 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-047-82/+52
| |
| * mesa xkeyboard-config git update 3 sep 2012marha2012-09-0311-154/+133
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3137-1791/+1349
| | | | | | | | git update 31 Aug 2012
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-2733-1689/+1392
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | mesa xkeyboard-config git update 3 sep 2012marha2012-09-0411-154/+133
| |
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-0437-1791/+1349
| | | | | | | | git update 31 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-0433-1689/+1392
| | | | | | | | 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-217-423/+1779
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-217-423/+1779
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-172-1/+3
|\|
| * fontconfig mesa git update 17 Aug 2012marha2012-08-172-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1619-251/+1519
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-1619-251/+1519
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1321-105/+153
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-1321-105/+153
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0312-29/+89
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-0312-29/+89
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-013-0/+260
|\|
| * git mesa update 1 Aug 2012marha2012-08-013-0/+260
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3147-1799/+2375
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3147-1799/+2375
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-185-3/+78
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-185-3/+78
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1316-27/+300
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1316-27/+300
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-116-9/+119
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-116-9/+119
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-063-10/+2
|\| | | | | | | | | | | | | | | 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-063-10/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-041-7/+14
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-041-7/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-021-6/+0
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-021-6/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-298-22/+99
|\| | | | | | | | | | | 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-298-22/+99
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2812-93/+136
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2812-93/+136
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-229-71/+384
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-229-71/+384
| |