aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/released'marha2012-07-1619-304/+352
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore
| * libX11 mesa git update 16 Jul 2012marha2012-07-1619-304/+352
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1343-311/+1228
|\| | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c
| * xserver mesa git update 13 Jul 2012marha2012-07-1343-311/+1228
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-127-82/+266
|\|
| * mesa xserver git update 12 Jul 2012marha2012-07-127-82/+266
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-1115-14/+376
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-1115-14/+376
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-118-67/+205
|\| | | | | | | | | | | | | | | | | | | | | 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-108-67/+205
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-091-3/+5
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-091-3/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-069-43/+417
|\| | | | | | | | | | | | | | | 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-069-43/+417
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-049-46/+76
|\| | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c
| * mesa xserver git update 4 Jul 2012marha2012-07-049-46/+76
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0213-243/+252
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0213-243/+252
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2910-60/+107
|\| | | | | | | | | | | 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-2910-60/+107
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2855-298/+821
|\|
| * xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012marha2012-06-2855-298/+821
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2235-524/+846
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2235-502/+824
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-2119-110/+261
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-2119-110/+261
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1954-997/+1025
|\|
| * mesa git update 19 Juni 2012marha2012-06-1954-997/+1025
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1811-79/+161
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-1811-79/+161
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1587-1608/+2029
|\| | | | | | | | | | | | | | | 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-1587-1608/+2029
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-12131-2530/+377
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-12131-2530/+377
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-115-26/+25
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-115-26/+25
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08321-54365/+54762
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08322-54376/+54787
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0413-13/+144
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-0413-13/+144
| | | | | | | | May 2012
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-301-1/+1
| |
* | dispatch.h glapitable.h enums.c are now generated automaticallymarha2012-05-302-1/+16
| |
* | Only define INLINE when it is not defined yetmarha2012-05-301-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-3020-103991/+427
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-3020-103991/+427
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-291-3/+3
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-291-3/+3
| |
* | Updated mesa project filesmarha2012-05-294-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2521-166/+280
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2521-166/+280
| |