Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 27 | -2494/+2448 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 2012 | marha | 2012-01-11 | 28 | -2440/+2390 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 1 | -1/+1 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 11 | -41/+108 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-12-23 | 11 | -41/+108 |
| | | |||||
* | | Increased version to 1.11.3.0 | marha | 2011-12-17 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 3 | -23/+84 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 3 | -23/+84 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 31 | -3004/+2986 |
|\| | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-12-16 | 31 | -3004/+2986 |
| | | |||||
* | | Added -parentprocessid command line parameter | marha | 2011-12-16 | 1 | -0/+12 |
| | | |||||
* | | Solved compilation error | marha | 2011-12-16 | 1 | -18/+18 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 2 | -1756/+1760 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 2 | -1756/+1760 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 11 | -683/+696 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 11 | -683/+696 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 1 | -2/+0 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 61 | -11461/+11482 |
|\| | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-11-25 | 61 | -11472/+11493 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 11 | -1902/+1917 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 11 | -1902/+1917 |
| | | |||||
* | | Bumped version to 1.11.2 | marha | 2011-11-18 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 4 | -2/+7 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 4 | -2/+7 |
| | | |||||
* | | Solved possible crashes due to null pointer access | marha | 2011-11-08 | 3 | -6/+10 |
| | | |||||
* | | miPointerSetPosition interface has been changes (solved problem of mouse | marha | 2011-11-08 | 1 | -1/+3 |
| | | | | | | | | not working anymore) | ||||
* | | Solved problem of QueryMonitors not working | marha | 2011-11-08 | 1 | -1/+1 |
| | | |||||
* | | Solved compile problems | marha | 2011-11-07 | 1 | -10/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 1 | -1/+4 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 1 | -1/+4 |
| | | |||||
* | | Solved compile problems | marha | 2011-11-04 | 2 | -2/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 30 | -3876/+3755 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-11-04 | 31 | -3952/+3765 |
| | | |||||
* | | Solved crash due to NULL pointer | marha | 2011-10-28 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 22 | -1652/+1792 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 22 | -1652/+1792 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 58 | -8232/+7533 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 58 | -8232/+7533 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Handle more motif window decorating handling | marha | 2011-10-10 | 2 | -1/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 25 | -6242/+6197 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 25 | -6242/+6197 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Added swrast dll based on wgl | marha | 2011-10-05 | 19 | -2/+37089 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 16 | -787/+822 |
|\| | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-09-27 | 16 | -787/+822 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 54 | -15165/+15201 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-09-22 | 54 | -15190/+15226 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 122 | -89043/+89043 |
| | | |||||
* | | Version bumped to 1.11.0.0 | marha | 2011-09-05 | 1 | -1/+1 |
| | |