aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-02-098-282/+240
|\
| * mesa git update 8 feb 2012marha2012-02-088-282/+240
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-0612-151/+166
|\|
| * mesa git update 6 feb 2012marha2012-02-0612-151/+166
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-015-327/+182
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-015-327/+182
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-289-235/+593
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-289-235/+593
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-267-22/+48
|\|
| * xwininfo xcb-proto mesa xserver git update 26 12 2012marha2012-01-267-22/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2518-254/+431
|\|
| * mesa git update 25 jan 2012marha2012-01-2518-254/+431
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-235-131/+119
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-235-131/+119
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2013-248/+232
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-2013-248/+232
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-172-5/+3
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-172-5/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1328-193/+301
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1328-193/+301
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1110-32/+587
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1110-32/+587
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-099-54/+69
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-099-54/+69
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0623-724/+487
|\| | | | | | | | | | | 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-0623-724/+487
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2911-193/+156
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2811-193/+156
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2511-489/+440
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2511-489/+440
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2311-34/+183
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2311-34/+183
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1717-118/+215
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1717-118/+215
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-147-3157/+2069
|\| | | | | | | | | | | | | | | | | 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-143-2049/+2058
| |
| * git update pixman mesa 13 dec 2011marha2011-12-135-1108/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1221-2355/+3143
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1221-2355/+3143
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-083-3/+14
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-083-3/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0526-5134/+5464
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0526-5134/+5464
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2930-827/+959
|\|
| * mesa git update 29 nov 2011marha2011-11-2930-827/+959
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-286-1173/+1241
|\|
| * mesa git update 28 nov 2011marha2011-11-286-1173/+1241
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-259-73/+112
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-259-73/+112
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-216-23/+67
|\|