Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 1 | -238/+232 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -237/+231 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 8 | -9476/+9476 |
| | | |||||
* | | Synchronised glx files with mesa | marha | 2011-09-06 | 4 | -1691/+2603 |
| | | |||||
* | | synchronised file (different file format: dos <> unix) | marha | 2011-07-18 | 1 | -180/+180 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-14 | 1 | -166/+165 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c | ||||
| * | mesa xserver git update 14 july 2011 | marha | 2011-07-14 | 1 | -166/+165 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-01 | 4 | -435/+440 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -426/+438 |
| | | | | | | | | 2011 | ||||
* | | Synchronised files with mesa | marha | 2011-06-21 | 2 | -19/+28 |
| | | |||||
* | | Syncrhonised file with mesa | marha | 2011-06-16 | 1 | -1084/+2644 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-16 | 3 | -101/+7688 |
|\| | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp | ||||
| * | xserver xkeyboard-config xkbcomp git update 16 June 2011 | marha | 2011-06-16 | 3 | -101/+7688 |
| | | |||||
* | | Synchronised files | marha | 2011-06-09 | 1 | -12/+7 |
| | | |||||
* | | Synchronised files with mesa | marha | 2011-06-03 | 3 | -1743/+1760 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 1 | -0/+5 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 1 | -2784/+10211 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 1 | -151/+159 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 1 | -101/+101 |
| | | |||||
* | | Synchronised files | marha | 2011-04-29 | 1 | -3/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 4 | -11/+16 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 4 | -1816/+1821 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 12 | -1578/+1770 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -3772/+3783 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 5 | -1608/+1735 |
|\| | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 3 | -1646/+1655 |
|\| | |||||
* | | Synchronised files | marha | 2011-04-01 | 1 | -3/+13 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 24 | -10390/+1773 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 15 | -9351/+2173 |
| | | |||||
* | | Solved link errors. Functions not implemented | marha | 2011-03-30 | 1 | -3/+3 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 8 | -1773/+1806 |
|\| | |||||
* | | Synchronised files | marha | 2011-03-28 | 3 | -4/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 3 | -1347/+1347 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 3 | -4/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 10 | -1250/+1243 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 5 | -151/+126 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 3 | -243/+74 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 4 | -453/+5 |
| | | |||||
* | | Remove GLXversion | marha | 2011-03-07 | 1 | -1/+0 |
| | | |||||
* | | Synchronize Xserver glx/rensize.c with mesa src/glx/compsize.c | marha | 2011-03-07 | 1 | -0/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 2 | -3292/+3317 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 2 | -3277/+3302 |
| | | |||||
* | | Define _GLAPI_NO_EXPORTS in glx makefile to solve compilation problem due to ↵ | marha | 2011-01-26 | 1 | -1/+1 |
| | | | | | | | | latest change in glapi.h | ||||
* | | Synchronised files | marha | 2011-01-26 | 1 | -5/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-19 | 3 | -3186/+3482 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 3 | -3167/+3463 |
| | | |||||
* | | Previous fix in glxext.c was to drastically. It could cause crashes. | marha | 2011-01-17 | 2 | -3/+13 |
| | | |||||
* | | Reverted. Checked in by accident | marha | 2011-01-16 | 1 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-16 | 5 | -1755/+1905 |
|\| |