aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-11-199-58/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
| * git update 19 nov 2012marha2012-11-199-58/+66
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-099-6/+75
|\| | | | | | | | | * origin/released: mesa git update 9 nov 2012
| * mesa git update 9 nov 2012marha2012-11-099-6/+75
| | | | | | | | mesa: 011f8458805e443ac9130865d2840a929a00cabf
* | Merge remote-tracking branch 'origin/released'marha2012-11-077-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 7 nov 2012 Conflicts: mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mesa/main/.gitignore xkbcomp/listing.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c
| * xserver mesa xkbcomp git update 7 nov 2012marha2012-11-077-11/+11
| | | | | | | | | | | | xserver: 011f8458805e443ac9130865d2840a929a00cabf xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4 mesa: f42518962a08ce927e4ddd233d19d2661e135834
* | Merge remote-tracking branch 'origin/released'marha2012-11-077-40/+92
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-057-40/+92
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Merge remote-tracking branch 'origin/released'marha2012-10-311-0/+1
|\| | | | | | | | | * origin/released: mesa git update 31 oct 2012
| * mesa git update 31 oct 2012marha2012-10-311-0/+1
| | | | | | | | mesa: 183e122bdfe27f875c3c121964484dae9587c051
* | Merge remote-tracking branch 'origin/released'marha2012-10-265-23/+27
|\| | | | | | | | | * origin/released: fontconfig pixman mesa git update 26 oct 2012
| * fontconfig pixman mesa git update 26 oct 2012marha2012-10-265-23/+27
| | | | | | | | | | | | fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
* | Merge remote-tracking branch 'origin/released'marha2012-10-042-6/+6
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-042-6/+6
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
* | Merge remote-tracking branch 'origin/released'marha2012-10-012-22/+18
|\| | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
| * libxcb mesa pixman xkeyboard-config git update 1 oct 2012marha2012-10-012-22/+18
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Added -p option to bison command lines to avoid link problemsmarha2012-09-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-181-1/+1
|\|
| * mesa git update 18 sep 2012marha2012-09-181-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-1710-17/+9
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-1710-17/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-09-142-3/+21
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-142-3/+21
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-1/+1
| | | | | | | | git update 31 Aug 2012
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-272-2/+2
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-1/+1
| | | | | | | | git update 31 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-042-2/+2
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | 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
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 10:39:36 +0000