aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2130-684/+1255
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-2130-684/+1255
| |
* | Updated mesa project filemarha2012-05-164-8/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-1543-1702/+1838
|\|
| * xserver mesa git update 15 May 2012marha2012-05-159-211/+177
| |
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-1434-1491/+1661
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-101-3/+1
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-101-3/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-0945-555/+831
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-0938-539/+724
| |
| * xserver mesa git update 3 May 2012marha2012-05-037-16/+107
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-024-13/+10
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-024-13/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-3024-647/+632
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-3024-647/+632
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-238-19/+15
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-238-19/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-2039-1280/+1281
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-2039-1280/+1281
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-177-70/+21
|\|
| * fontconfig mesa git update 17 Apr 2012marha2012-04-177-70/+21
| |
* | Added ir_builder.cpp to projectmarha2012-04-164-0/+8
| |