aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-216-23/+67
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1715-2638/+2975
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1715-2638/+2975
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-146-1158/+57
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-146-1158/+57
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-103-0/+141
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-103-0/+141
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0917-1128/+1384
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0917-1128/+1384
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0438-5156/+6481
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0438-5156/+6481
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-284-944/+977
|\|
| * mesa git update 28 okt 2011marha2011-10-284-944/+977
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2723-232/+325
|\|
| * mesa git update 27 okt 2011marha2011-10-274-6/+90
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2623-226/+235
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1920-1149/+1008
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1920-1149/+1008
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1020-160/+356
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1020-160/+356
| |