aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/program
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-162-21/+0
|\
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-162-21/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-131-1/+5
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-131-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h
| * mesa xserver xkeyboard-config git update 7 Aug 2012marha2012-08-071-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-031-1/+4
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-031-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-011-1/+1
|\|
| * git mesa update 1 Aug 2012marha2012-08-011-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-317-30/+73
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-317-30/+73
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-061-5/+6
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-061-5/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-181-0/+1
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-181-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-152-6/+16
|\| | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-152-6/+16
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-088-551/+556
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * Used synchronise script to update filesmarha2012-06-089-551/+560
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-251-103/+8
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-251-103/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-211-10/+10
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-211-10/+10
| |
* | 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
| |