aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-09-17132-1704/+226
|\ | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-17132-1704/+226
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1415-99/+213
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-1415-99/+213
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-0684-354/+288
|\|
| * xserver mesa git update 6 sep 2012marha2012-09-0684-354/+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-03261-58609/+321
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-3160-2006/+1806
| | | | | | | | 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-2759-1972/+1682
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | mesa xkeyboard-config git update 3 sep 2012marha2012-09-04261-58609/+321
| |
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-0460-2006/+1806
| | | | | | | | git update 31 Aug 2012
* | fontconfig mesa xserver git update 28 Aug 2012marha2012-09-045-10/+122
| |
* | mesa:marha2012-09-042-4/+4
| | | | | | | | | | - Added texcompress_cpal.c - Removed dlopen.c
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-0459-1972/+1682
| | | | | | | | 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-1715-146/+130
|\|
| * fontconfig mesa git update 17 Aug 2012marha2012-08-1715-146/+130
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1654-487/+2169
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-1655-513/+3182
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1350-233/+825
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-1350-233/+825
| |
* | synchronised filesmarha2012-08-071-26/+1013
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0720-259/+499
|\| | | | | | | | | | | | | | | | | | | | | 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-0720-259/+499
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0334-459/+613
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-0334-459/+613
| |
* | Solved compile errorsmarha2012-08-012-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-0114-79/+431
|\|
| * git mesa update 1 Aug 2012marha2012-08-0114-79/+431
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-31120-2427/+3768
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-31120-2427/+3768
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1814-37/+121
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1814-37/+121
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1619-304/+352
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-1619-304/+352
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1343-311/+1228
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1343-311/+1228
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-127-82/+266
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-127-82/+266
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1115-14/+376
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-1115-14/+376
| |
* | 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