aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-0933-1010/+358
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0674-1925/+2082
|\| | | | | | | | | | | 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-0675-1927/+2084
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2927-1217/+1213
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2827-1217/+1213
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Solved compilation errormarha2011-12-251-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2542-6762/+3678
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2542-6762/+3678
| |
* | Solved compilation errorsmarha2011-12-231-1/+1
| |
* | Back previous versionmarha2011-12-231-0/+1
| |
* | synchronised filesmarha2011-12-231-1/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2325-513/+869
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2325-513/+869
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1758-1660/+2216
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1758-1660/+2216
| |
* | Synchronised filesmarha2011-12-151-2/+4
| |
* | Added missing files to project filesmarha2011-12-154-8/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1428-3073/+3207
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update mesa 14 dec 2011marha2011-12-1417-2901/+3005
| |
| * git update pixman mesa 13 dec 2011marha2011-12-1313-157/+196
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1247-3663/+5442
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1247-3663/+5442
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-084-7/+28
|\|