aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised filesmarha2012-06-225-1872/+2040
|
* Merge remote-tracking branch 'origin/released'marha2012-06-2216-45/+12
|\ | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-2216-45/+12
| |
* | Synchronised filesmarha2012-06-214-1430/+1502
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-216-18/+42
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-216-18/+42
| |
* | Freetype library name changed1.12.2.0marha2012-06-151-2/+2
| |
* | Increased version number to 1.12.2.0marha2012-06-152-2/+2
| |
* | Solved compile warningmarha2012-06-151-2/+8
| |
* | Syncrhonised filesmarha2012-06-154-2177/+1401
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1530-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 2012marha2012-06-1530-147/+652
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-08499-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 filesmarha2012-06-08502-75223/+75424
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-047-7/+107
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-047-7/+107
| | | | | | | | May 2012
* | Update filesthatshouldbethesame.py and synchronised filesmarha2012-05-301-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-3017-14866/+17092
|\|
| * mesa xkeyboard-config git update 30 May 2012marha2012-05-3017-14866/+17092
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-294-16/+87
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-294-16/+90
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2552-183/+244
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-2552-183/+244
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-2125-339/+368
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-2125-339/+368
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-1521-123/+17
|\|
| * xserver mesa git update 15 May 2012marha2012-05-1520-122/+16
| |
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-141-1/+1
| |
* | Solved compile warningmarha2012-05-101-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-104-58/+108
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-104-57/+108
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-099-19/+114
|\|
| * libX11 mesa xserver xkeyboard-configmarha2012-05-098-7/+86
| |
| * xserver mesa git update 3 May 2012marha2012-05-032-12/+28
| |
* | Made sure that the number of maximum clients is back at 1024marha2012-05-043-3/+6
| |
* | Now the display number can be set to automatic by specifying -1marha2012-05-035-34/+69
| |
* | When -displayfd specified, assume it is a handle to shared memory to writemarha2012-05-031-0/+7
| | | | | | | | the display id to.
* | Create hidden console when calling plink, otherwise some commands willmarha2012-05-031-1/+23
| | | | | | | | exit immediately (like gnome-terminal)
* | Do not try to bind the same address twicemarha2012-05-021-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 256marha2012-05-021-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-0217-58/+269
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-0217-56/+266
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-3013-184/+283
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-3013-184/+283
| |
* | Solved compilation errors and warnings due to latest commitmarha2012-04-204-39/+43
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-2042-930/+2198
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-2042-930/+2197
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-16315-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 2012marha2012-04-16315-9938/+10066
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-132-348/+482
|\|