Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 1 | -8/+9 |
|\ | | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c | ||||
| * | mesa pixman xserver git update 24 sep 2012 | marha | 2012-09-24 | 1 | -8/+9 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Updated makefile because of the addition of sharp_vndr in symbols | marha | 2012-09-14 | 2 | -2/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-14 | 10 | -2/+384 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012 | marha | 2012-09-14 | 10 | -2/+384 |
| | | |||||
| * | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-03 | 1 | -3/+5 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 9 | -78/+158 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -11/+3 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | mesa xkeyboard-config git update 3 sep 2012 | marha | 2012-09-04 | 1 | -3/+5 |
| | | |||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 9 | -78/+158 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -11/+3 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 1 | -1/+1 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 1 | -0/+1 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h | ||||
| * | mesa xserver xkeyboard-config git update 7 Aug 2012 | marha | 2012-08-07 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 2 | -1/+35 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 2 | -1/+35 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | 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 2012 | marha | 2012-06-29 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 1 | -6/+5 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 1 | -6/+5 |
| | | |||||
* | | Solved compile problems when compiled from a clean tree | marha | 2012-06-27 | 1 | -0/+4 |
| | | |||||
* | | The following libraries have no xserver dependent compilation anymore | marha | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libX11 libxcb pixman libXdmcp libXau libXfont libXfont libXfont libXfont libXfont libXfont libXfont libfontenc libXinerama | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 1 | -2/+1 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 1 | -2/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 222 | -59877/+59979 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 224 | -59909/+60017 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 1 | -2/+2 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 1 | -2/+2 |
| | | | | | | | | May 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-30 | 17 | -14866/+17092 |
|\| | |||||
| * | mesa xkeyboard-config git update 30 May 2012 | marha | 2012-05-30 | 17 | -14866/+17092 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 2 | -4/+4 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 2 | -4/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 1 | -7/+11 |
|\| | |||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 1 | -7/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 1 | -1/+1 |
|\| | |||||
| * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-09 | 3 | -2/+23 |
|\| | |||||
| * | libX11 mesa xserver xkeyboard-config | marha | 2012-05-09 | 3 | -2/+23 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 3 | -3/+18 |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 3 | -3/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 4 | -773/+5 |
|\| | | | | | | | | | | | 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 | 4 | -773/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-13 | 1 | -2/+2 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012 | marha | 2012-04-13 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-10 | 4 | -10/+93 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 | marha | 2012-04-10 | 4 | -10/+93 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-28 | 3 | -1/+47 |
|\| |