aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/released'marha2012-01-1346-540/+692
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1346-540/+692
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1122-570/+1253
|\| | | | | | | | | | | | | | | | | | | | | | | 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-1122-570/+1253
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0925-984/+199
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-0925-984/+199
| |
* | Solved compile problemmarha2012-01-061-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-0648-1644/+1170
|\| | | | | | | | | | | 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-0648-1645/+1171
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2923-1066/+1030
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-2823-1066/+1030
| |
* | Increaser version of swrastmarha2011-12-291-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2540-6747/+3609
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-2540-6747/+3609
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2320-384/+656
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2320-384/+656
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1748-824/+1178
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-1748-824/+1178
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1418-2213/+2268
|\| | | | | | | | | | | | | | | | | 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-146-2056/+2072
| |
| * git update pixman mesa 13 dec 2011marha2011-12-1313-157/+196
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1246-3663/+5438
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-1246-3663/+5438
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-084-7/+28
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-084-7/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-0541-6324/+6689
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-0541-6324/+6689
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2950-1361/+1505
|\|
| * mesa git update 29 nov 2011marha2011-11-2950-1361/+1505
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2810-1173/+1313
|\|
| * mesa git update 28 nov 2011marha2011-11-2810-1173/+1313
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-2515-112/+185
|\| | | | | | | | | | | | | | | | | | | 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-2515-112/+185
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-219-170/+218
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-219-170/+218
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1737-4926/+4033
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-1737-4926/+4033
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-1418-1225/+968
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-1418-1225/+968
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-105-10/+263
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-105-10/+263
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0937-1386/+1699
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0937-1386/+1699
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0715-601/+440
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-0715-601/+440
| |
* | Solved mesa compile problemsmarha2011-11-041-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0478-10693/+8923
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0478-10686/+8916
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-286-946/+979
|\|
| * mesa git update 28 okt 2011marha2011-10-286-946/+979
| |