Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru | ||||
| * | xserver xkeyboard-config mesa git update 3 Jun 2011 | marha | 2011-06-03 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 3 | -13/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -13/+5 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-23 | 1 | -9/+16 |
|\| | |||||
| * | xserver git update 23 May 2011 | marha | 2011-05-23 | 1 | -9/+16 |
| | | |||||
* | | Reverted last change to solve xmodmap problem | marha | 2011-05-23 | 1 | -3/+3 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 5 | -347/+563 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 5 | -348/+560 |
| | | |||||
* | | 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-28 | 2 | -2/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 2 | -2/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -149/+215 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -2207/+2273 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 2 | -7/+10 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 2 | -518/+521 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-07 | 2 | -9/+9 |
|\| | |||||
| * | xserver pixman mesa git update 7 Apr 2011 | marha | 2011-04-07 | 2 | -1323/+1323 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 4 | -2142/+2128 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 4 | -3915/+3901 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -966/+964 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -965/+963 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 2 | -28/+107 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 2 | -2630/+2709 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 2 | -7/+7 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 2 | -3691/+3691 |
| | | |||||
* | | Delay calling winInitializeModeKeyStates until the keyboard device has been ↵ | marha | 2011-03-16 | 1 | -0/+5 |
| | | | | | | | | started | ||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 4 | -123/+137 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 4 | -5916/+5930 |
| | | |||||
* | | Removed deperecated.c from makefile | marha | 2011-03-10 | 1 | -3/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 2 | -166/+0 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 2 | -240/+74 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 9 | -8023/+7909 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 9 | -7230/+7116 |
| | | |||||
* | | 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 |
| | | |||||
* | | Solved error running xmodmap | marha | 2011-02-28 | 1 | -3/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-22 | 1 | -2/+14 |
|\| | |||||
| * | xserver libX11 pixman mesa git update 22 Feb 2011 | marha | 2011-02-22 | 1 | -734/+746 |
| | | |||||
* | | Solved problem of wrongly generated error message. | marha | 2011-02-11 | 1 | -2/+2 |
| | | |||||
* | | Solved wrong type for g_iClipboardWindow extern variable | marha | 2011-01-31 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 3 | -7349/+7343 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 3 | -7342/+7336 |
| | | |||||
* | | Prevent crash with remote font servers | marha | 2011-01-16 | 1 | -31/+69 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 3 | -14/+8 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 3 | -14/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-23 | 1 | -2086/+2086 |
|\| | |||||
| * | xserver libX11 libXdmcp pixman git update 22-12-2010 | marha | 2010-12-22 | 1 | -2084/+2084 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-16 | 1 | -1324/+1338 |
|\| | |||||
| * | xserver libXdmcp git update 16-12-2010 | marha | 2010-12-16 | 1 | -1309/+1323 |
| | |