aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-09-065-7/+7
|\
| * xserver mesa git update 6 sep 2012marha2012-09-065-7/+7
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-312-0/+31
| | | | | | | | git update 31 Aug 2012
| * fontconfig mesa xserver git update 28 Aug 2012marha2012-08-281-10/+25
| |
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-272-8/+12
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-042-0/+31
| | | | | | | | git update 31 Aug 2012
* | fontconfig mesa xserver git update 28 Aug 2012marha2012-09-041-10/+25
| |
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-042-8/+12
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-165-8/+59
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-165-8/+59
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-132-15/+31
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-132-15/+31
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-164-78/+70
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-164-78/+70
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-131-2/+48
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-131-2/+48
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-123-78/+102
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-123-78/+102
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-111-1/+21
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-111-1/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-062-10/+8
|\| | | | | | | | | | | | | | | 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-062-10/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-041-23/+29
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-041-23/+29
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-285-6/+6
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-285-6/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-224-53/+152
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-224-31/+130
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-213-1/+43
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-213-1/+43
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-192-0/+9
|\|
| * mesa git update 19 Juni 2012marha2012-06-192-0/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-153-34/+226
|\| | | | | | | | | | | | | | | 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-153-34/+226
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-121-1/+1
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-121-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-111-11/+0
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-111-11/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0818-2037/+2057
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0818-2050/+2070
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-042-0/+74
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-042-0/+74
| | | | | | | | May 2012
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-301-1/+1
| |
* | Only define INLINE when it is not defined yetmarha2012-05-301-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-3010-78140/+5
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-3010-78140/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-231-1/+1
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-231-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-109-6682/+6645
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-109-6682/+6645
| |