| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 2 | -986/+985 |
| |\| | | | | | | | | | | | | | | | | | 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 | 2 | -986/+985 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 7 | -126/+109 |
| |\| | | | | | | | | | | | | | | | | | | | 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 | 7 | -126/+109 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 1 | -1/+1 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| | * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 2 | -6/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -2/+5 |
| |\| | |||||
| | * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -2/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | | | | | | | update 5 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -6/+2 |
| |\| | | | | | | | | | | | | | | | | | 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 | 1 | -6/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 4 | -488/+373 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -488/+373 |
| | | | |||||
| * | | Synchronised line endinge with release branch | marha | 2011-09-12 | 14 | -18467/+18467 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-15 | 2 | -4/+46 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c | ||||
| | * | xserver libX11 mesa git update 15 July | marha | 2011-07-15 | 2 | -4/+46 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-08 | 1 | -3/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c | ||||
| | * | xserver libX11 mesa git update 8 Jun 2011 | marha | 2011-06-08 | 1 | -3/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-06 | 1 | -15/+26 |
| |\| | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c | ||||
| | * | mesa xserver xkb git update 6 Jun 2011 | marha | 2011-06-06 | 1 | -15/+26 |
| | | | |||||
| * | | merge ^/branches/released . | marha | 2011-05-16 | 3 | -55/+43 |
| |\| | |||||
| | * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 3 | -1487/+1475 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -1/+0 |
| |\| | |||||
| | * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -1102/+1101 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-04-05 | 4 | -2766/+2781 |
| |\| | |||||
| | * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 4 | -400/+417 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-03-17 | 3 | -24/+51 |
| |\| | |||||
| | * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 3 | -359/+386 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -9/+2 |
| |\| | |||||
| | * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -1441/+1434 |
| | | | |||||
| * | | Wrong type cast | marha | 2011-03-14 | 1 | -1/+1 |
| | | | |||||
| * | | Synchronised again with released version | marha | 2011-03-14 | 1 | -3/+3 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-03-04 | 9 | -85/+65 |
| |\| | |||||
| | * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 9 | -13905/+13885 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-02-20 | 2 | -7205/+7249 |
| |\| | |||||
| | * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 2 | -7199/+7243 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-02-03 | 1 | -6737/+6742 |
| |\| | |||||
| | * | libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 | marha | 2011-02-03 | 1 | -6735/+6740 |
| | | | |||||
| * | | Solved problem of wrong type for extern variable | marha | 2011-01-31 | 1 | -1/+1 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-01-21 | 2 | -2961/+2965 |
| |\| | |||||
| | * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 2 | -2961/+2965 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-01-19 | 1 | -467/+463 |
| |\| | |||||
| | * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 1 | -463/+459 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-12-12 | 2 | -24/+38 |
| |\| | |||||
| | * | xserver git update 10/12/2010 | marha | 2010-12-10 | 2 | -24/+38 |
| | | | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |