aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/released'marha2012-03-1315-166/+57
|\|
| * fontconfig mesa git update 13 Mar 2012marha2012-03-1315-166/+57
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-1239-10142/+11834
|\| | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
| * xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012marha2012-03-1239-10142/+11834
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-095-85/+142
|\| | | | | | | | | Conflicts: libxcb/src/xcb_in.c
| * libxcb fontconfig pixman mesa git update 9 Mar 2012marha2012-03-095-85/+142
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-083-19/+34
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-083-19/+34
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-0523-781/+840
|\|
| * libfontenc xserver pixman mesa git update 5 Mar 2012marha2012-03-0523-781/+840
| | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2
* | Merge remote-tracking branch 'origin/released'marha2012-02-2912-185/+219
|\|
| * xserver fontconfig mesa pixman git update 29 Feb 2012marha2012-02-2912-185/+219
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2734-367/+494
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig pixman mesa git update 27 Feb 2012marha2012-02-2734-367/+494
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2411-501/+592
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-2411-501/+592
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2231-611/+444
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-2231-611/+444
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-1331-1106/+1049
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-1331-1106/+1049
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0913-285/+251
|\|
| * mesa git update 8 feb 2012marha2012-02-0813-285/+251
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0624-762/+864
|\|
| * mesa git update 6 feb 2012marha2012-02-0624-762/+864
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0123-516/+260
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-0123-516/+260
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-303-327/+243
|\|
| * libxcb mesa git update 30 jan 2012marha2012-01-303-327/+243
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2826-817/+1129
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2826-817/+1129
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2624-616/+704
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-2624-616/+704
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2559-5507/+1385
|\|
| * mesa git update 25 jan 2012marha2012-01-2559-5507/+1385
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-246-4/+184
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-246-4/+184
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2319-593/+230
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-2319-593/+230
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2025-288/+311
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-2025-288/+311
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-176-130/+128
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-176-130/+128
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1351-593/+882
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1351-593/+882
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1132-713/+1430
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-1132-713/+1430
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0932-1006/+358
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-0932-1006/+358
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0672-1898/+2033
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c