aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-05-091-0/+3
|\
| * libX11 mesa xserver xkeyboard-configmarha2012-05-091-0/+3
| |
* | Made sure that the number of maximum clients is back at 1024marha2012-05-042-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-021-0/+1
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-021-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-301-1/+2
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-301-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-203-4/+62
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-203-4/+62
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-1625-1496/+1487
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1625-1487/+1478
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-281-1/+1
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-271-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-2638-5237/+4809
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/shm.c xorg-server/Xext/syncsrv.h xorg-server/Xext/xvmain.c xorg-server/Xi/exevents.c xorg-server/Xi/opendev.c xorg-server/composite/compalloc.c xorg-server/composite/compoverlay.c xorg-server/dix/colormap.c xorg-server/dix/devices.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/dix/eventconvert.c xorg-server/dix/events.c xorg-server/dix/gc.c xorg-server/dix/getevents.c xorg-server/dix/main.c xorg-server/dix/privates.c xorg-server/dix/registry.c xorg-server/dix/resource.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/fb/fb.h xorg-server/fb/fbcopy.c xorg-server/fb/fbpixmap.c xorg-server/glx/dispatch.h xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmds.c xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdricommon.c xorg-server/glx/glxdriswrast.c xorg-server/glx/glxext.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_util.c xorg-server/glx/rensize.c xorg-server/glx/single2swap.c xorg-server/glx/singlepix.c xorg-server/glx/singlepixswap.c xorg-server/glx/singlesize.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/ephyr/hostx.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/compiler.h xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glwrap.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.h xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winallpriv.c xorg-server/hw/xwin/winauth.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincmap.c xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winlayouts.h xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winregistry.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/wintrayicon.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c xorg-server/include/callback.h xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/include/os.h xorg-server/include/scrnintstr.h xorg-server/mi/micmap.c xorg-server/mi/miinitext.c xorg-server/mi/mioverlay.c xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/mi/miwindow.c xorg-server/miext/damage/damage.c xorg-server/miext/rootless/rootlessGC.c xorg-server/miext/rootless/rootlessWindow.c xorg-server/os/WaitFor.c xorg-server/os/access.c xorg-server/os/connection.c xorg-server/os/io.c xorg-server/os/log.c xorg-server/os/osinit.c xorg-server/os/utils.c xorg-server/os/xdmcp.c xorg-server/os/xprintf.c xorg-server/os/xstrans.c xorg-server/render/mipict.c xorg-server/xkb/xkbActions.c xorg-server/xkb/xkbInit.c xorg-server/xkeyboard-config/compat/default.in
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-2338-5237/+4809
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-02-134-60/+73
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-134-60/+73
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-241-1/+1
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-241-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-134-19/+22
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-134-18/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-114-20/+18
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-114-20/+18
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-238-6/+192
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-238-6/+192
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-171-0/+6
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-171-0/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-1611-278/+304
|\| | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c
| * xserver git update 16 dec 2011marha2011-12-1611-278/+304
| |
* | Solved compilation errormarha2011-12-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-127-33/+97
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-127-33/+97
| |
* | Synchronised dix-config.h and dix-config.h.inmarha2011-12-081-7/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-086-66/+56
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-086-66/+56
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-055-4/+10
|\| | | | | | | | | Conflicts: xorg-server/dix/dispatch.c
| * xserver xkeyboard-config mesa git update 5 dec 2011marha2011-12-055-4/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-259-124/+131
|\| | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-2510-126/+133
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-212-1/+3
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-212-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-171-2/+2
|\| | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-044-581/+587
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-044-577/+583
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-276-10/+34
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-266-10/+34
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-194-13/+11
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-194-13/+11
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Solved link error due to trunc not defined in VC++marha2011-10-061-0/+5
| |