| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 1 | -0/+6 |
| |\ | | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in | ||||
| | * | xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012 | marha | 2012-03-12 | 1 | -0/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-27 | 1 | -1/+1 |
| |\| | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c | ||||
| | * | fontconfig pixman mesa git update 27 Feb 2012 | marha | 2012-02-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-09 | 1 | -1/+5 |
| |\| | |||||
| | * | mesa git update 8 feb 2012 | marha | 2012-02-08 | 1 | -1/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-06 | 1 | -1/+4 |
| |\| | |||||
| | * | mesa git update 6 feb 2012 | marha | 2012-02-06 | 1 | -1/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-01 | 3 | -0/+19 |
| |\| | |||||
| | * | xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012 | marha | 2012-02-01 | 3 | -0/+19 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-30 | 1 | -2/+1 |
| |\| | |||||
| | * | libxcb mesa git update 30 jan 2012 | marha | 2012-01-30 | 1 | -2/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-28 | 2 | -1/+38 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winkeynames.h xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwndproc.c | ||||
| | * | mesa xserver git update 28 jan 2012 | marha | 2012-01-28 | 2 | -1/+38 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-25 | 9 | -1899/+58 |
| |\| | |||||
| | * | mesa git update 25 jan 2012 | marha | 2012-01-25 | 9 | -1899/+58 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-24 | 3 | -0/+100 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/grabs.c | ||||
| | * | libX11 mesa xserver git update 24 jan 2012 | marha | 2012-01-24 | 3 | -0/+100 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 5 | -192/+5 |
| |\| | |||||
| | * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 5 | -192/+5 |
| | | | |||||
| * | | Solved compile problem | marha | 2012-01-06 | 1 | -1/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 4 | -29/+184 |
| |\| | | | | | | | | | | | 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 | 4 | -30/+185 |
| | | | |||||
| * | | Increaser version of swrast | marha | 2011-12-29 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-25 | 7 | -811/+421 |
| |\| | |||||
| | * | mesa xkeyboard-config xserver git update 25 dec 2011 | marha | 2011-12-25 | 7 | -811/+421 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 1 | -7/+8 |
| |\| | |||||
| | * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 1 | -7/+8 |
| | | | |||||
| * | | 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-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 | 16 | -3661/+367 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 16 | -3654/+360 |
| | | | |||||
| * | | 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-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 | ||||
| * | | 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-22 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-15 | 1 | -1/+3 |
| |\| | |||||
| | * | libxtrans libXmu libXext mesa pixman git update 15 sept 2011 | marha | 2011-09-15 | 1 | -1/+3 |
| | | | |||||
| * | | Synchronised line endinge with release branch | marha | 2011-09-12 | 5 | -4700/+4700 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-12 | 6 | -1224/+1132 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -1222/+1130 |
| | | | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |