aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext/rootless
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-162-352/+346
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-162-352/+346
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-267-4413/+4413
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-4402/+4404
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2011-11-211-2/+2
|\|
| * xserver xkeyboard-config mesa git update 21 nov 2011marha2011-11-211-2/+2
| |
* | Synchronised line endinge with release branchmarha2011-09-122-1375/+1375
| |
* | svn merge ^/branches/released .marha2011-04-282-3/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-282-1378/+1375
| |
* | svn merge ^/branches/released .marha2011-02-201-17/+16
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-17/+16
| |
* | Solved problem of using an unitialised variable.marha2011-01-311-1/+1
| |
* | Solved compilation errorsmarha2011-01-282-5/+8
| |
* | svn merge ^/branches/released .marha2011-01-081-2/+3
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-081-2/+3
| |
* | svn merge ^/branches/released .marha2010-12-011-12/+0
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-011-12/+0
| |
* | svn merge "^/branches/released" .marha2010-11-152-6/+3
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-142-6/+3
| |
* | svn merge ^/branches/released .marha2010-09-146-660/+410
|\|
| * xserver libX11 pixman git update 14/9/2010marha2010-09-146-660/+410
| |
* | svn merge ^/branches/released .marha2010-08-202-453/+459
|\|
| * xserver git update 19/8/2010marha2010-08-192-453/+459
| |
* | svn merge ^/branches/released .marha2010-08-181-0/+3
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-181-0/+3
| |
* | Cleanup in rootless codemarha2010-07-231-3/+3
| |
* | svn merge ^/branches/released .marha2010-07-201-0/+7
|\|
| * xserver libX11 git update 20/7/2010marha2010-07-201-0/+7
| |
* | svn merge ^/branches/released .marha2010-06-117-3039/+3035
|\|
| * xserver git update 11/6/2010marha2010-06-117-3036/+3032
| |
| * xserver git update 15/5/2010marha2010-05-152-2411/+2411
| |
| * xserver git update 4/5/2010marha2010-05-041-4/+0
| |
| * Removed files not in the git repositorymarha2010-04-281-705/+0
| |
| * git update 22/4/2010marha2010-04-222-10/+0
| |
| * Updated to following packages:marha2010-04-021-0/+2
| | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0
| * Updated to xorg-server-1.7.99.902marha2010-03-221-0/+3
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-162-2417/+2417
| |
* | svn merge -r571:HEAD "^/branches/released" .marha2010-05-051-4/+0
| |
* | svn merge -r554:HEAD "^/branches/released" .marha2010-04-281-705/+0
| |
* | svn merge -r541:HEAD "^/branches/released" .marha2010-04-222-10/+0
| |
* | svn merge -r522:HEAD ^/branches/released .marha2010-04-021-0/+2
| |
* | svn merge -c505 ^/branches/released .marha2010-03-221-0/+3
| |
* | svn merge ^/branches/released .marha2010-02-251-2/+1
|\|
| * Git update 24/2/2010"marha2010-02-241-1/+1
| |
* | svn merge ^/branches/releasedmarha2010-02-141-1/+5
|\|
| * Updated to xorg-server-1.7.99.901marha2010-02-141-1/+5
| |
* | svn merge ^/branches/releasedmarha2009-12-201-1/+13
|\|
| * Switched to xorg-server-1.7.99.2marha2009-12-201-1/+13
| |
* | svn merge ^/branches/releasedmarha2009-12-151-1/+1
|\|
| * Git update 14/12/2009marha2009-12-141-1/+1
| |