aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/released'marha2012-02-019-42/+45
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-019-42/+45
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-251-56/+57
|\|
| * mesa git update 25 jan 2012marha2012-01-251-56/+57
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-232-26/+42
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-232-26/+42
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-203-16/+24
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-203-16/+24
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-134-53/+185
|\| | | | | | | | | | | | | | | | | | | | | | | 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-134-53/+185
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-113-4/+50
|\| | | | | | | | | | | | | | | | | | | | | | | 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-113-4/+50
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-094-16/+100
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-094-16/+100
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-067-56/+262
|\| | | | | | | | | | | 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-068-57/+263
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-251-12/+0
|\|
| * mesa xkeyboard-config xserver git update 25 dec 2011marha2011-12-251-12/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-231-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-142-10/+39
|\| | | | | | | | | | | | | | | | | 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-142-10/+39
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-051-0/+1
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-051-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-256-12/+24
|\| | | | | | | | | | | | | | | | | | | 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-256-12/+24
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-212-0/+53
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-212-0/+53
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-176-189/+335
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-176-189/+335
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-145-112/+96
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-145-112/+96
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-102-65/+510
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-102-65/+510
| |
* | Solved compile problem in debugmarha2011-11-101-2/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0910-208/+968
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0910-208/+968
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0426-757/+918
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0426-757/+918
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-285-31/+81
|\|
| * mesa git update 28 okt 2011marha2011-10-285-31/+81
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2716-32/+318
|\|
| * mesa git update 27 okt 2011marha2011-10-272-9/+9
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2615-23/+309
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-196-21/+58
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-196-21/+58
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-103-18/+1
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-103-18/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-062-110/+123
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-062-110/+123
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011