| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-02-01 | 2 | -28/+0 |
| |\ | |||||
| | * | xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 | marha | 2012-02-01 | 2 | -28/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 2 | -3/+9 |
| |\| | |||||
| | * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 2 | -3/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 2 | -31/+6 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -31/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-11 | 2 | -488/+490 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -488/+490 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-23 | 1 | -15/+59 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -15/+59 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 1 | -0/+1 |
| |\| | |||||
| | * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 3 | -10/+10 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| | * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 3 | -10/+10 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-29 | 2 | -5/+5 |
| |\| | |||||
| | * | mesa git update 29 nov 2011 | marha | 2011-11-29 | 2 | -5/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-21 | 1 | -23/+6 |
| |\| | |||||
| | * | xserver xkeyboard-config mesa git update 21 nov 2011 | marha | 2011-11-21 | 1 | -23/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-17 | 1 | -56/+3 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c | ||||
| | * | xserver mesa git update 17 nov 2011 | marha | 2011-11-17 | 1 | -56/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 8 | -223/+149 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| | * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 8 | -223/+149 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 4 | -15/+29 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -15/+29 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-28 | 1 | -1/+1 |
| |\| | |||||
| | * | mesa git update 28 okt 2011 | marha | 2011-10-28 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -14/+42 |
| |\| | |||||
| | * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -14/+42 |
| | | | |||||
| * | | Solved link problems | marha | 2011-10-19 | 1 | -0/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 6 | -268/+254 |
| |\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| | * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 6 | -268/+254 |
| | | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 3 | -104/+11 |
| |\| | |||||
| | * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 3 | -104/+11 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 11 | -89/+201 |
| |\| | | | | | | | | | | | | | | | | | 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 | 11 | -89/+201 |
| | | | | | | | | | update 5 oct 2011 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-29 | 1 | -2/+10 |
| |\| | |||||
| | * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 1 | -2/+10 |
| | | | |||||
| * | | 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-20 | 1 | -3/+2 |
| |\| | |||||
| | * | libX11 libxtrans mesa git update 20 sep 2011 | marha | 2011-09-20 | 1 | -3/+2 |
| | | | |||||
| * | | Synchronised line endinge with release branch | marha | 2011-09-12 | 18 | -14272/+14272 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-12 | 2 | -1462/+1473 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | git update 12 sep 2011 | marha | 2011-09-12 | 2 | -1462/+1473 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-05 | 1 | -5/+5 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_in.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/swrast/s_readpix.c | ||||
| | * | mesa git update 1 Sep 2011 | marha | 2011-09-01 | 1 | -5/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-31 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/README.WIN32 mesalib/docs/install.html mesalib/src/glu/sgi/include/gluos.h mesalib/src/mesa/drivers/windows/gdi/wgl.c mesalib/src/mesa/main/state.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/tnl/t_draw.c | ||||
| | * | mesa git update 31 aug 2011 | marha | 2011-08-31 | 1 | -1/+1 |
| | | | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |