| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 8 | -1768/+1711 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -1768/+1711 |
| | | | |||||
| * | | Synchronised line endinge with release branch | marha | 2011-09-12 | 7 | -2500/+2500 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-01 | 1 | -736/+736 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-08-01 | 1 | -736/+736 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-07 | 1 | -1506/+1506 |
| |\| | | | | | | | | | Conflicts: xorg-server/randr/rrcrtc.c | ||||
| | * | git update xserver mesa 7 Jun 2011 | marha | 2011-06-07 | 1 | -1506/+1506 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -6/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in | ||||
| | * | libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011 | marha | 2011-05-29 | 1 | -6/+6 |
| | | | |||||
| * | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -4/+4 |
| |\| | |||||
| | * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -4/+4 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -2/+30 |
| |\| | |||||
| | * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -2/+30 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-03-15 | 3 | -0/+161 |
| |\| | |||||
| | * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 3 | -2823/+2984 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-02-25 | 15 | -2404/+1116 |
| |\| | |||||
| | * | Forgotten in previous commit | marha | 2011-02-25 | 3 | -432/+0 |
| | | | |||||
| | * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 10 | -5139/+4286 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2011-02-20 | 2 | -2/+2 |
| |\| | |||||
| | * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 2 | -2/+2 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-12-23 | 1 | -1030/+1042 |
| |\| | |||||
| | * | xserver libXext git update 20-12-2010 | marha | 2010-12-20 | 1 | -1025/+1037 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-12-08 | 14 | -671/+1959 |
| |\| | |||||
| | * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 13 | -670/+1955 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-10-19 | 4 | -233/+29 |
| |\| | |||||
| | * | xserver update 19/10/2010 | marha | 2010-10-19 | 3 | -232/+29 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-09-30 | 5 | -3/+56 |
| |\| | |||||
| | * | xserver libX11 xkeyboard-config git update 30/9/2010 | marha | 2010-09-30 | 5 | -3/+56 |
| | | | |||||
| * | | svn merge "^/branches/released" . | marha | 2010-06-23 | 1 | -14/+14 |
| |\| | |||||
| | * | xserver git update 23/6/2010 | marha | 2010-06-23 | 1 | -14/+14 |
| | | | |||||
| * | | svn merge ^/branches/released . | marha | 2010-06-11 | 8 | -157/+91 |
| |\| | |||||
| | * | xserver git update 11/6/2010 | marha | 2010-06-11 | 8 | -157/+91 |
| | | | |||||
| * | | svn merge "^/branches/released" . | marha | 2010-05-20 | 6 | -998/+991 |
| |\| | |||||
| | * | xserver git update 20/5/2010 | marha | 2010-05-20 | 6 | -998/+991 |
| | | | |||||
| | * | xserver git update 15/5/2010 | marha | 2010-05-15 | 10 | -5235/+5235 |
| | | | |||||
| | * | Removed files not in the git repository | marha | 2010-04-28 | 1 | -762/+0 |
| | | | |||||
| | * | git update 22/4/2010 | marha | 2010-04-22 | 3 | -8/+0 |
| | | | |||||
| | * | Updated to following packages: | marha | 2010-04-02 | 1 | -0/+2 |
| | | | | | | | | | | | pixman-0.18.0 xorg-server-1.8.0 | ||||
| | * | Updated to xorg-server-1.7.99.902 | marha | 2010-03-22 | 1 | -0/+3 |
| | | | |||||
| * | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 10 | -5245/+5245 |
| | | | |||||
| * | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 1 | -762/+0 |
| | | | |||||
| * | | svn merge -r541:HEAD "^/branches/released" . | marha | 2010-04-22 | 3 | -8/+0 |
| | | | |||||
| * | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 1 | -0/+2 |
| | | | |||||
| * | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 1 | -0/+3 |
| | | | |||||
| * | | svn merge ^/branches/released | marha | 2010-02-14 | 1 | -763/+758 |
| |\| | |||||
| | * | git update 14-2-2010 | marha | 2010-02-14 | 1 | -763/+758 |
| | | | |||||
| * | | svn merge ^/branches/released | marha | 2010-02-14 | 1 | -1/+5 |
| |\| | |||||
| | * | Updated to xorg-server-1.7.99.901 | marha | 2010-02-14 | 1 | -1/+5 |
| | | | |||||
| * | | svn merge ^/branches/released | marha | 2009-12-20 | 5 | -12/+18 |
| |\| | |||||
| | * | Switched to xorg-server-1.7.99.2 | marha | 2009-12-20 | 5 | -12/+18 |
| | | | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |