aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-1317-228/+95
|\
| * fontconfig mesa git update 13 Mar 2012marha2012-03-1317-228/+95
| |
* | Added main/errors.c to projectmarha2012-03-122-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-1240-10144/+11836
|\| | | | | | | | | | | | | | | 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-1240-10144/+11836
| |
* | 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-084-19/+42
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-084-19/+42
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-0529-830/+896
|\|
| * libfontenc xserver pixman mesa git update 5 Mar 2012marha2012-03-0529-830/+896
| | | | | | | | | | | | | | 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-2736-368/+649
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig pixman mesa git update 27 Feb 2012marha2012-02-2736-368/+649
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2413-503/+607
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-2413-503/+607
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2234-612/+453
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-2234-612/+453
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-1338-1122/+1124
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-1338-1122/+1124
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0916-294/+269
|\|
| * mesa git update 8 feb 2012marha2012-02-0816-294/+269
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0625-762/+870
|\|
| * mesa git update 6 feb 2012marha2012-02-0625-762/+870
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0130-3769/+288
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-0130-3769/+288
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-304-331/+243
|\|
| * libxcb mesa git update 30 jan 2012marha2012-01-304-331/+243
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2829-882/+1142
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2829-882/+1142
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2625-617/+705
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-2625-617/+705
| |
* | Removed deleted file from projectmarha2012-01-252-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2561-5508/+1413
|\|
| * mesa git update 25 jan 2012marha2012-01-2561-5508/+1413
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2410-40/+388
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-2410-40/+388
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2327-675/+283
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-2327-675/+283
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2030-292/+348
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-2030-292/+348
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-178-134/+156
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-178-134/+156
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1355-644/+931
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1355-644/+931
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1138-722/+1442
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1138-722/+1442
| |
* | Removed deleted file from projectmarha2012-01-102-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0933-1010/+358
|\|