Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 1 | -2/+5 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c | ||||
| * | libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012 | marha | 2012-01-13 | 1 | -2/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 2 | -20/+31 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 2 | -20/+31 |
| | | |||||
* | | Solved compile problem | marha | 2012-01-06 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 5 | -38/+193 |
|\| | | | | | | | | | | | 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 | 5 | -39/+194 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 1 | -0/+2 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 1 | -0/+2 |
| | | |||||
* | | Increaser version of swrast | marha | 2011-12-29 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 9 | -1143/+445 |
|\| | |||||
| * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 9 | -1143/+445 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 2 | -0/+13 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+13 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 1 | -35/+12 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 1 | -35/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 3 | -20/+22 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 3 | -20/+22 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 1 | -2/+2 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 2 | -30/+16 |
|\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 2 | -30/+16 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 1 | -4/+109 |
|\| | |||||
| * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 1 | -4/+109 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-07 | 8 | -587/+382 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| * | xserver pixman mesa git update 7 nov 2011 | marha | 2011-11-07 | 8 | -587/+382 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 20 | -3664/+520 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 20 | -3657/+513 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -1/+4 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -1/+4 |
| | | |||||
* | | Removed useless code | marha | 2011-10-27 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 3 | -3/+32 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 3 | -3/+32 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 1 | -1/+2 |
|\| | |||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 4 | -11/+26 |
|\| | | | | | | | | | | | | | | | | | 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 | 4 | -11/+26 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-30 | 1 | -4/+0 |
|\| | | | | | | | | | Conflicts: openssl/Makefile | ||||
| * | mesa xkeyboard-config git update 30 sep 2011 | marha | 2011-09-30 | 1 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -7/+0 |
|\| | | | | | | | | | | | | | | | | | 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 | -7/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-26 | 1 | -0/+2 |
|\| | | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c | ||||
| * | fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011 | marha | 2011-09-26 | 1 | -0/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 2 | -5/+41 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+41 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-19 | 2 | -4/+8 |
|\| | | | | | | | | | Conflicts: libfontenc/src/fontenc.c | ||||
| * | xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontenc | marha | 2011-09-19 | 2 | -4/+8 |
| | | | | | | | | mesa git update 19 sept 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-15 | 3 | -10/+13 |
|\| | |||||
| * | libxtrans libXmu libXext mesa pixman git update 15 sept 2011 | marha | 2011-09-15 | 3 | -10/+13 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 10 | -8270/+8270 |
| | |