Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 16 | -45/+12 |
|\ | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 16 | -45/+12 |
| | | |||||
* | | Synchronised files | marha | 2012-06-21 | 4 | -1430/+1502 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 6 | -18/+42 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 6 | -18/+42 |
| | | |||||
* | | Freetype library name changed1.12.2.0 | marha | 2012-06-15 | 1 | -2/+2 |
| | | |||||
* | | Increased version number to 1.12.2.0 | marha | 2012-06-15 | 2 | -2/+2 |
| | | |||||
* | | Solved compile warning | marha | 2012-06-15 | 1 | -2/+8 |
| | | |||||
* | | Syncrhonised files | marha | 2012-06-15 | 4 | -2177/+1401 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 30 | -147/+652 |
|\| | | | | | | | | | | | | | | | 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 | 30 | -147/+652 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 499 | -75196/+75310 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 502 | -75223/+75424 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 7 | -7/+107 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 7 | -7/+107 |
| | | | | | | | | May 2012 | ||||
* | | Update filesthatshouldbethesame.py and synchronised files | marha | 2012-05-30 | 1 | -0/+2 |
| | | |||||
* | | 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-29 | 4 | -16/+87 |
|\| | | | | | | | | | | | 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 | 4 | -16/+90 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 52 | -183/+244 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 52 | -183/+244 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 25 | -339/+368 |
|\| | |||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 25 | -339/+368 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 21 | -123/+17 |
|\| | |||||
| * | xserver mesa git update 15 May 2012 | marha | 2012-05-15 | 20 | -122/+16 |
| | | |||||
| * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 1 | -1/+1 |
| | | |||||
* | | Solved compile warning | marha | 2012-05-10 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 4 | -58/+108 |
|\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 4 | -57/+108 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-09 | 9 | -19/+114 |
|\| | |||||
| * | libX11 mesa xserver xkeyboard-config | marha | 2012-05-09 | 8 | -7/+86 |
| | | |||||
| * | xserver mesa git update 3 May 2012 | marha | 2012-05-03 | 2 | -12/+28 |
| | | |||||
* | | Made sure that the number of maximum clients is back at 1024 | marha | 2012-05-04 | 3 | -3/+6 |
| | | |||||
* | | Now the display number can be set to automatic by specifying -1 | marha | 2012-05-03 | 5 | -34/+69 |
| | | |||||
* | | When -displayfd specified, assume it is a handle to shared memory to write | marha | 2012-05-03 | 1 | -0/+7 |
| | | | | | | | | the display id to. | ||||
* | | Create hidden console when calling plink, otherwise some commands will | marha | 2012-05-03 | 1 | -1/+23 |
| | | | | | | | | exit immediately (like gnome-terminal) | ||||
* | | Do not try to bind the same address twice | marha | 2012-05-02 | 1 | -0/+4 |
| | | | | | | | | | | Do not retry to bind when it fails, to speed up searching for a free listening display port | ||||
* | | Solved overflow problem: last can have the value 256 | marha | 2012-05-02 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 17 | -58/+269 |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 17 | -56/+266 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 13 | -184/+283 |
|\| | | | | | | | | | | | 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 | 13 | -184/+283 |
| | | |||||
* | | Solved compilation errors and warnings due to latest commit | marha | 2012-04-20 | 4 | -39/+43 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 42 | -930/+2198 |
|\| | | | | | | | | | | | 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 | 42 | -930/+2197 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-16 | 315 | -10074/+10207 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h | ||||
| * | libX11 xserver pixman mesa git update 16 Apr 2012 | marha | 2012-04-16 | 315 | -9938/+10066 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-13 | 2 | -348/+482 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012 | marha | 2012-04-13 | 2 | -348/+482 |
| | |