| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 7 | -56/+262 |
| |\ | | | | | | | | | | | 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 | 8 | -57/+263 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 1 | -12/+0 |
| |\| | |||||
| | * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 1 | -12/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 1 | -1/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 2 | -10/+39 |
| |\| | | | | | | | | | | | | | | | | | 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 mesa 14 dec 2011 | marha | 2011-12-14 | 2 | -10/+39 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 1 | -0/+1 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| | * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 6 | -12/+24 |
| |\| | | | | | | | | | | | | | | | | | | | 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 | 6 | -12/+24 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 2 | -0/+53 |
| |\| | |||||
| | * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 2 | -0/+53 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 6 | -189/+335 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| | * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 6 | -189/+335 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-14 | 5 | -112/+96 |
| |\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | ||||
| | * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 5 | -112/+96 |
| | | | | | | | | | 14 nov 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 2 | -65/+510 |
| |\| | |||||
| | * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 2 | -65/+510 |
| | | | |||||
| * | | Solved compile problem in debug | marha | 2011-11-10 | 1 | -2/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 10 | -208/+968 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| | * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 10 | -208/+968 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 26 | -757/+918 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 26 | -757/+918 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-28 | 5 | -31/+81 |
| |\| | |||||
| | * | mesa git update 28 okt 2011 | marha | 2011-10-28 | 5 | -31/+81 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 16 | -32/+318 |
| |\| | |||||
| | * | mesa git update 27 okt 2011 | marha | 2011-10-27 | 2 | -9/+9 |
| | | | |||||
| | * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 15 | -23/+309 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 6 | -21/+58 |
| |\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| | * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 6 | -21/+58 |
| | | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 3 | -18/+1 |
| |\| | |||||
| | * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 3 | -18/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-06 | 2 | -110/+123 |
| |\| | |||||
| | * | upgraded to inputproto-2.1.99.1 | marha | 2011-10-06 | 2 | -110/+123 |
| | | | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 5 | -117/+121 |
| |\| | | | | | | | | | | | | | | | | | 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 | 5 | -117/+121 |
| | | | | | | | | | update 5 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-29 | 1 | -1/+5 |
| |\| | |||||
| | * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 1 | -1/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -0/+344 |
| |\| | | | | | | | | | | | | | | | | | 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 | -0/+344 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-26 | 12 | -15/+38 |
| |\| | | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c | ||||
| | * | fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011 | marha | 2011-09-26 | 12 | -15/+38 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 1 | -4/+4 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -4/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-15 | 4 | -32/+21 |
| |\| | |||||
| | * | libxtrans libXmu libXext mesa pixman git update 15 sept 2011 | marha | 2011-09-15 | 4 | -32/+21 |
| | | | |||||
| * | | Synchronised line endinge with release branch | marha | 2011-09-12 | 34 | -22586/+22586 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-12 | 9 | -262/+278 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h | ||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |