aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-02-221-6/+4
|\
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-221-6/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-131-1/+2
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-131-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-091-1/+5
|\|
| * mesa git update 8 feb 2012marha2012-02-081-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-061-1/+4
|\|
| * mesa git update 6 feb 2012marha2012-02-061-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-013-0/+19
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-013-0/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-301-2/+1
|\|
| * libxcb mesa git update 30 jan 2012marha2012-01-301-2/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-282-1/+38
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c
| * mesa xserver git update 28 jan 2012marha2012-01-282-1/+38
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2512-1952/+63
|\|
| * mesa git update 25 jan 2012marha2012-01-2512-1952/+63
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-244-1/+106
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-244-1/+106
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-235-192/+5
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-235-192/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-131-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-131-2/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-092-20/+31
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-092-20/+31
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-065-38/+193
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-065-39/+194
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-291-0/+2
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-281-0/+2
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-259-1143/+445
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-259-1143/+445
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-232-0/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-232-0/+13
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-171-35/+12
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-171-35/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-123-20/+22
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-123-20/+22
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-051-2/+2
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-051-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-172-30/+16
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-172-30/+16
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-101-4/+109
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-101-4/+109
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-078-587/+382
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-078-587/+382
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0420-3664/+520
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-0420-3657/+513
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-1/+4
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-1/+4
| |