aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-07-063-10/+2
|\ | | | | | | | | | | | | | | 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-063-10/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-041-7/+14
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-041-7/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-021-6/+0
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-021-6/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-298-22/+99
|\| | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c
| * xkeyboard-config xserver pixman mesa git update 29 Jun 2012marha2012-06-298-22/+99
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2812-93/+136
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2812-93/+136
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-229-71/+384
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-229-71/+384
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-215-0/+60
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-215-0/+60
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-194-6/+41
|\|
| * mesa git update 19 Juni 2012marha2012-06-194-6/+41
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-181-1/+10
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-181-1/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-1/+3
|\| | | | | | | | | | | | | | | 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-151-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-122-0/+13
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-122-0/+13
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-111-10/+10
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-111-10/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0845-6751/+6346
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0845-6751/+6348
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-041-0/+8
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-041-0/+8
| | | | | | | | May 2012
* | dispatch.h glapitable.h enums.c are now generated automaticallymarha2012-05-301-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-303-25414/+0
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-303-25414/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-256-50/+43
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-256-50/+43
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2112-157/+205
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-2112-157/+205
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-1511-64/+123
|\|
| * xserver mesa git update 15 May 2012marha2012-05-152-2/+20
| |
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-149-62/+103
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-099-19/+138
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-097-19/+92
| |
| * xserver mesa git update 3 May 2012marha2012-05-032-0/+46
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-021-0/+7
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-021-0/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-301-0/+1
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-301-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-236-18/+10
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-236-18/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-207-22/+76
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-207-22/+76
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-172-63/+0
|\|