Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-08 | 1 | -0/+4 | |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | |||||
| * | fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesa | marha | 2012-03-08 | 1 | -0/+4 | |
| | | | | | | | | git update 8 Mar 2012 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-05 | 8 | -52/+301 | |
|\| | ||||||
| * | libfontenc xserver pixman mesa git update 5 Mar 2012 | marha | 2012-03-05 | 8 | -52/+301 | |
| | | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-29 | 1 | -11/+44 | |
|\| | ||||||
| * | xserver fontconfig mesa pixman git update 29 Feb 2012 | marha | 2012-02-29 | 1 | -11/+44 | |
| | | ||||||
* | | Solved compilation warnings | marha | 2012-02-27 | 1 | -3/+15 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-27 | 11 | -181/+1274 | |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | |||||
| * | fontconfig pixman mesa git update 27 Feb 2012 | marha | 2012-02-27 | 11 | -169/+1274 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-24 | 1 | -20/+5 | |
|\| | ||||||
| * | fontconfig libX11 pixman xserver git update 24 Feb 2012 | marha | 2012-02-24 | 1 | -20/+5 | |
| | | ||||||
* | | Solved run-time errors due to type casting in debug | marha | 2012-02-23 | 1 | -3/+3 | |
| | | ||||||
* | | Compilation problem solved | marha | 2012-02-22 | 1 | -2/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-22 | 3 | -64/+65 | |
|\| | ||||||
| * | fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012 | marha | 2012-02-22 | 3 | -64/+65 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-01 | 3 | -9/+50 | |
|\| | ||||||
| * | xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 | marha | 2012-02-01 | 3 | -9/+50 | |
| | | ||||||
* | | Avoid run-time type cast exceptions in debug | marha | 2012-01-23 | 1 | -3/+3 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-17 | 8 | -412/+495 | |
|\| | ||||||
| * | git update mesa pixman xserver 17 jan 2012 | marha | 2012-01-17 | 8 | -412/+495 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 11 | -277/+317 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c | |||||
| * | mesa pixman xserver git update 11 jan 2012 | marha | 2012-01-11 | 12 | -278/+318 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 3 | -19/+27 | |
|\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c | |||||
| * | libX11 mesa pixman git update 6 jan 2012 | marha | 2012-01-06 | 3 | -19/+27 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 2 | -0/+12 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 1 | -12/+44 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py | |||||
| * | git update pixman mesa 13 dec 2011 | marha | 2011-12-13 | 1 | -12/+44 | |
| | | ||||||
* | | 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-14 | 1 | -1/+20 | |
|\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | |||||
| * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 1 | -1/+20 | |
| | | | | | | | | 14 nov 2011 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 20 | -1000/+978 | |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | |||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 20 | -1000/+978 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 2 | -10/+6 | |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | |||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 2 | -17/+17 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 4 | -5/+14 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -5/+14 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 4 | -144/+124 | |
|\| | ||||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 4 | -144/+124 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 4 | -165/+912 | |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | |||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 4 | -165/+912 | |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 8 | -272/+788 | |
|\| | ||||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 8 | -272/+788 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -1/+0 | |
|\| | | | | | | | | | | | | | | | | | 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 | -1/+0 | |
| | | | | | | | | update 5 oct 2011 | |||||
* | | Solved run-time error in debug due to type cast | marha | 2011-09-30 | 1 | -1/+1 | |
| | | ||||||
* | | Solved pixman compilaton problem | marha | 2011-09-28 | 3 | -47/+25 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 8 | -722/+889 | |
|\| | ||||||
| * | mesa pixman xkeyboard-config git update 28 sep 2011 | marha | 2011-09-28 | 8 | -722/+889 | |
| | |