aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
Commit message (Collapse)AuthorAgeFilesLines
* Do not use LockFile as a variable name since it gives a name collision withmarha2011-09-271-0/+4
| | | | microsoft header files
* Merge remote-tracking branch 'origin/released'marha2011-09-272-61/+136
|\ | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-272-48/+123
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-222-1151/+1149
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-222-1150/+1148
| |
* | Synchronised line endinge with release branchmarha2011-09-127-6524/+6524
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-011-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv
| * mesa xserver pixman xkeyboard-config git update 1 aug 2011marha2011-08-011-2/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-011-5/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-011-5/+1
| | | | | | | | 2011
* | merge ^/branches/released .marha2011-05-161-1/+6
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-161-1/+6
| |
* | svn merge ^/branches/released .marha2011-04-283-13/+22
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-283-2670/+2679
| |
* | svn merge ^/branches/released .marha2011-04-141-4/+3
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-1308/+1307
| |
* | svn merge ^/branches/released .marha2011-04-051-14/+7
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-1821/+1814
| |
* | svn merge ^/branches/released .marha2011-03-281-310/+309
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-281-2/+1
| |
* | svn merge ^/branches/released .marha2011-03-153-348/+311
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-154-346/+309
| |
* | With -from also bind to ipv6 socketmarha2011-03-101-2/+11
| |
* | Solved wrong test on osmarha2011-03-091-1/+1
| |
* | Enable only functions defined in windows XPmarha2011-03-095-73/+303
| | | | | | | | | | Enabled IPV6 compilation
* | svn merge ^/branches/released .marha2011-03-043-72/+389
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-042-12/+316
| |
* | Do not use a delay of 0marha2011-02-161-17/+9
| |
* | When XDMCP -from is specified, only register the requested addressmarha2011-02-141-1/+1
| |
* | Added host selection menu in case -broadcast was specifiedmarha2011-02-011-1/+60
| |
* | svn merge ^/branches/released .marha2011-01-211-687/+693
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-211-681/+687
| |
* | svn merge ^/branches/released .marha2011-01-083-2098/+2111
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-083-2087/+2100
| |
* | svn merge ^/branches/released .marha2010-12-291-1/+15
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-1/+15
| |
* | svn merge ^/branches/released .marha2010-12-233-2656/+2649
|\|
| * xserver libX11 libXdmcp pixman git update 22-12-2010marha2010-12-222-2409/+2402
| |
| * xserver libXext git update 20-12-2010marha2010-12-201-226/+226
| |
* | svn merge ^/branches/released .marha2010-12-123-40/+151
|\|
| * xserver git update 10/12/2010marha2010-12-103-34/+150
| |
* | svn merge ^/branches/released .marha2010-12-081-14/+7
|\|
| * xserver pixman git update 7-12-2010marha2010-12-071-14/+7
| |
* | svn merge "^/branches/released" .marha2010-11-155-707/+705
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-145-695/+693
| |
* | svn merge ^/branches/released .marha2010-10-193-137/+13
|\|
| * xserver update 19/10/2010marha2010-10-193-137/+13
| |
* | Solved problem when having multiple network cardsmarha2010-09-303-58/+100
| |
* | Make sure that both AllClients and AllSockets contain valid sockets in ↵marha2010-09-191-13/+18
| | | | | | | | checkconnections
* | Implemented smart schedule timermarha2010-09-191-9/+46
| |