aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-163-17/+10
|\
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-163-17/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-1313-26/+543
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-1313-26/+543
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-033-0/+7
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-033-0/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-017-59/+169
|\|
| * git mesa update 1 Aug 2012marha2012-08-017-59/+169
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3120-44/+725
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3120-44/+725
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-181-2/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
| * fontconfig mesa xserver git update 18 Jul 2012marha2012-07-181-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-166-146/+175
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-166-146/+175
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-134-16/+135
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-134-16/+135
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-117-35/+188
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-107-35/+188
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-042-6/+2
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-042-6/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-288-60/+133
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-288-60/+133
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-185-2/+14
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-185-2/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-154-7/+101
|\| | | | | | | | | | | | | | | 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-154-7/+101
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1218-118/+150
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-1218-118/+150
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-113-5/+15
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-113-5/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0815-287/+395
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0815-285/+401
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-042-4/+1
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-042-4/+1
| | | | | | | | May 2012
* | Merge remote-tracking branch 'origin/released'marha2012-05-255-4/+217
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-255-4/+217
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-212-327/+399
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-212-327/+399
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-157-209/+157
|\|
| * xserver mesa git update 15 May 2012marha2012-05-157-209/+157
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-0910-460/+538
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-096-444/+490
| |
| * xserver mesa git update 3 May 2012marha2012-05-034-16/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-022-13/+2
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-022-13/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-305-4/+12
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-305-4/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-206-397/+509
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-206-397/+509
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-173-3/+15
|\|