Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 1 | -4/+17 |
|\ | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h | ||||
| * | fontconfig libX11 mesa pixman xserver git update 9 Jul 2012 | marha | 2012-07-09 | 1 | -4/+17 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | | 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 2012 | marha | 2012-07-06 | 1 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 4 | -6/+23 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 4 | -6/+23 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 2 | -3/+48 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 2 | -3/+48 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-19 | 2 | -2/+2 |
|\| | |||||
| * | mesa git update 19 Juni 2012 | marha | 2012-06-19 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 1 | -2/+12 |
|\| | |||||
| * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 1 | -2/+12 |
| | | |||||
* | | Solved compilation error in fontconfig | marha | 2012-06-15 | 1 | -3/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 9 | -34/+43 |
|\| | | | | | | | | | | | | | | | 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 2012 | marha | 2012-06-15 | 9 | -34/+45 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 13 | -49/+105 |
|\| | |||||
| * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 13 | -52/+108 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 9 | -74/+291 |
|\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 9 | -74/+291 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 1 | -0/+99 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 files | marha | 2012-06-08 | 1 | -0/+3 |
| | | |||||
* | | Solved lstat not defined error when linking with fontconfig | marha | 2012-06-04 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 13 | -25/+78 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 13 | -25/+78 |
| | | | | | | | | May 2012 | ||||
* | | fontconfig: solved compile warnings and link errors. | marha | 2012-05-29 | 3 | -2/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 6 | -150/+349 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 29 May 2012 | marha | 2012-05-29 | 6 | -150/+349 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 2 | -0/+28 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 2 | -0/+28 |
| | | |||||
* | | Solved compilation errors | marha | 2012-05-25 | 1 | -3/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 9 | -155/+371 |
|\| | |||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 9 | -155/+371 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 13 | -64/+103 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 13 | -64/+103 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 2 | -5/+3 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 2 | -5/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 5 | -27/+67 |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 5 | -27/+67 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 10 | -62/+329 |
|\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c | ||||
| * | fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 | marha | 2012-04-30 | 10 | -62/+329 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-23 | 10 | -93/+148 |
|\| | |||||
| * | fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012 | marha | 2012-04-23 | 10 | -93/+148 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 6 | -112/+130 |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c | ||||
| * | fontconfig libX11 mesa pixman xserver git update 20 april 2012 | marha | 2012-04-20 | 6 | -112/+130 |
| | | |||||
* | | solved compiler warning | marha | 2012-04-20 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-17 | 3 | -3/+6 |
|\| | |||||
| * | fontconfig mesa git update 17 Apr 2012 | marha | 2012-04-17 | 3 | -3/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-13 | 6 | -67/+275 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012 | marha | 2012-04-13 | 7 | -74/+275 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-10 | 8 | -214/+209 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c |