Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-10-09 | 2 | -5/+9 |
|\ | | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | ||||
| * | fontconfig xserver mesa xkeyboard-config git update 9 oct 2012 | marha | 2012-10-09 | 2 | -5/+9 |
| | | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 1 | -1/+17 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 1 | -1/+17 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-08-28 | 3 | -4/+2 |
| | | |||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -2/+1 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -2/+2 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | fontconfig mesa xserver git update 28 Aug 2012 | marha | 2012-09-04 | 3 | -4/+2 |
| | | |||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -2/+1 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-17 | 1 | -2/+2 |
|\| | |||||
| * | fontconfig mesa git update 17 Aug 2012 | marha | 2012-08-17 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 5 | -5/+11 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 5 | -5/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 4 | -6/+15 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c | ||||
| * | fontconfig mesa xserver git update 18 Jul 2012 | marha | 2012-07-18 | 4 | -6/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 3 | -2/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | 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 2012 | marha | 2012-07-10 | 2 | -1/+3 |
| | | |||||
* | | 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 |
| | |