aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-131-1/+1
|\
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-131-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-101-181/+5
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-101-181/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-271-87/+91
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig pixman mesa git update 27 Feb 2012marha2012-02-271-87/+91
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-012-28/+0
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-012-28/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-202-3/+9
|\|
| * xserver xkeyboard-config git update 20 jan 2012marha2012-01-202-3/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-132-31/+6
|\| | | | | | | | | | | | | | | | | | | | | | | 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-132-31/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-112-488/+490
|\| | | | | | | | | | | | | | | | | | | | | | | 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-112-488/+490
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-231-15/+59
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-15/+59
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-171-0/+1
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-171-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-141-0/+1
|\| | | | | | | | | | | | | | | | | 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-141-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-053-10/+10
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-053-10/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-292-5/+5
|\|
| * mesa git update 29 nov 2011marha2011-11-292-5/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-211-23/+6
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-211-23/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-171-56/+3
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-56/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-098-223/+149
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-098-223/+149
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-044-15/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-044-15/+29
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-281-1/+1
|\|
| * mesa git update 28 okt 2011marha2011-10-281-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-14/+42
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-14/+42
| |
* | Solved link problemsmarha2011-10-191-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-196-268/+254
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-196-268/+254
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-103-104/+11
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-103-104/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-0511-89/+201
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-0511-89/+201
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-291-2/+10
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-291-2/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-261-0/+2
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-261-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-201-3/+2
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-201-3/+2
| |
* | Synchronised line endinge with release branchmarha2011-09-1218-14272/+14272
| |