aboutsummaryrefslogtreecommitdiff
path: root/pixman
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-08-137-26/+163
|\
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-137-26/+163
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-036-5/+14
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-036-5/+14
| |
* | Solved compile errorsmarha2012-08-011-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3114-19/+476
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3114-19/+476
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-112-193/+157
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-112-193/+157
| |
* | synchronised pixman/pixman/makefile pixman/pixman/makefile.sourcesmarha2012-07-091-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0917-845/+1724
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0917-845/+1724
| |
* | Solved compilation warnings introduced in latest mergemarha2012-07-021-0/+1
| |
* | Solved compilation errors due to latest mergemarha2012-07-021-12/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0212-183/+645
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0212-183/+645
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-293-12/+72
|\| | | | | | | | | | | 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-293-12/+72
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-211-1/+5
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-211-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-182-0/+85
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-182-0/+85
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-0/+1
|\| | | | | | | | | | | | | | | 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-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-126-117/+136
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-126-117/+136
| |
* | Synchronised makefile with Makefile.sourcesmarha2012-06-111-27/+34
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1115-79/+1344
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-1115-79/+1344
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0817-3472/+3553
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0817-3472/+3553
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-0412-633/+628
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-0412-633/+628
| | | | | | | | May 2012
* | Solved compilation errorsmarha2012-05-291-10/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-297-48/+346
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-297-45/+347
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-254-32/+205
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-254-32/+205
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-212-1/+6
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-212-1/+6
| |
* | Solved compilation problemmarha2012-05-151-2/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-156-63/+365
|\|
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-146-63/+365
| |
* | Solved compile warnings and errorsmarha2012-04-301-16/+19
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-306-100/+824
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-306-101/+823
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-232-8/+15
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-232-8/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-201-1/+1
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-201-1/+1
| |