Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 5 | -1118/+1115 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma | ||||
| * | xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Juli | marha | 2011-07-01 | 5 | -1118/+1115 |
| | | | | | | | | 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 3 | -30/+40 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 3 | -402/+412 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 2 | -6/+6 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 2 | -6/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-01 | 21 | -2771/+2598 |
|\| | |||||
| * | libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵ | marha | 2011-04-01 | 21 | -6413/+6240 |
| | | | | | | | | Apr 2011 | ||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 3 | -7/+9 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 3 | -3115/+3117 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 1 | -2/+2 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 1 | -373/+373 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 3 | -9/+7 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 3 | -3117/+3115 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 3 | -75/+148 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 3 | -598/+671 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 1 | -4/+0 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 1 | -4/+0 |
| | | |||||
* | | Removed unused functions | marha | 2011-01-28 | 3 | -62/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 1 | -124/+124 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 1 | -124/+124 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 7 | -1374/+229 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver git update 15/11/2010 | marha | 2010-11-15 | 3 | -588/+2 |
| | | |||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 4 | -786/+227 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-14 | 1 | -2/+0 |
|\| | |||||
| * | xserver git update 14/10/2010 | marha | 2010-10-14 | 1 | -2/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-14 | 2 | -12/+1 |
|\| | |||||
| * | xserver libX11 pixman git update 14/9/2010 | marha | 2010-09-14 | 2 | -12/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-23 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 20/8/2010 | marha | 2010-08-20 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-18 | 1 | -6/+18 |
|\| | |||||
| * | libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010 | marha | 2010-08-18 | 1 | -6/+18 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 24 | -7202/+7185 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 24 | -7202/+7185 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 7 | -2890/+2892 |
| | | |||||
| * | xserver git update 4/5/2010 | marha | 2010-05-04 | 1 | -8/+8 |
| | | |||||
| * | Removed files not in the git repository | marha | 2010-04-28 | 1 | -1335/+0 |
| | | |||||
| * | git update 22/4/2010 | marha | 2010-04-22 | 3 | -499/+484 |
| | | |||||
| * | 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 | 2 | -0/+7 |
| | | |||||
* | | svn merge -r588:HEAD ^/branches/released . | marha | 2010-05-16 | 7 | -2881/+2883 |
| | | |||||
* | | svn merge -r571:HEAD "^/branches/released" . | marha | 2010-05-05 | 1 | -8/+8 |
| | | |||||
* | | svn merge -r554:HEAD "^/branches/released" . | marha | 2010-04-28 | 1 | -1335/+0 |
| | | |||||
* | | svn merge -r541:HEAD "^/branches/released" . | marha | 2010-04-22 | 3 | -500/+484 |
| | | |||||
* | | svn merge -r522:HEAD ^/branches/released . | marha | 2010-04-02 | 1 | -0/+2 |
| | | |||||
* | | svn merge -c505 ^/branches/released . | marha | 2010-03-22 | 2 | -0/+7 |
| | | |||||
* | | 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 |
| | |