Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 1 | -1/+86 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+86 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 1 | -0/+3 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 1 | -4/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -4/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -1/+1 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -0/+12 |
|\| | | | | | | | | | | | | | | | | | 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/+12 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -13/+20 |
|\| | | | | | | | | | | | | | | | | | 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 | -13/+20 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 1 | -2630/+2630 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -9/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -9/+0 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -6/+4 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -6/+4 |
| | | |||||
* | | Solved run-time exception in debug because value was larget then a s8 | marha | 2011-05-05 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -11/+38 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -11/+38 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -28/+4 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -2630/+2606 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -0/+2 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -2628/+2630 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 1 | -55/+79 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 1 | -55/+79 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 1 | -6/+8 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 1 | -2602/+2604 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 1 | -6/+11 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 1 | -6/+11 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 1 | -18/+32 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 1 | -18/+32 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-14 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 14/10/2010 | marha | 2010-10-14 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -9/+14 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -9/+14 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-18 | 1 | -6/+2 |
|\| | |||||
| * | libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010 | marha | 2010-08-18 | 1 | -6/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-02 | 1 | -1/+1 |
|\| | |||||
| * | git update 2/7/2010 | marha | 2010-07-02 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-16 | 1 | -1/+1 |
|\| | |||||
| * | xserver and libxcb git update 11/6/2010 | marha | 2010-06-16 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 1 | -20/+91 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 1 | -20/+87 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-27 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 27/5/2010 | marha | 2010-05-27 | 1 | -1/+1 |
| | |