| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c | ||||
| | * | randrproto fontconfig mesa xserver git update 6 Jul 2012 | marha | 2012-07-06 | 1 | -0/+8 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 1 | -23/+29 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| | * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 1 | -23/+29 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 5 | -6/+6 |
| |\| | |||||
| | * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 5 | -6/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 4 | -53/+152 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| | * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 4 | -31/+130 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 3 | -1/+43 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 3 | -1/+43 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-19 | 2 | -0/+9 |
| |\| | |||||
| | * | mesa git update 19 Juni 2012 | marha | 2012-06-19 | 2 | -0/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 3 | -34/+226 |
| |\| | | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h | ||||
| | * | fontconfig mesa pixman xserver git update 15 juni 2012 | marha | 2012-06-15 | 3 | -34/+226 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 1 | -1/+1 |
| |\| | |||||
| | * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 14 | -1213/+1213 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore | ||||
| | * | Used synchronise script to update files | marha | 2012-06-08 | 14 | -1227/+1227 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 1 | -0/+49 |
| |\| | |||||
| | * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 1 | -0/+49 |
| | | | | | | | | | May 2012 | ||||
| * | | Update filesthatshouldbethesame.py and synchronised files | marha | 2012-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | Only define INLINE when it is not defined yet | marha | 2012-05-30 | 1 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-30 | 2 | -4/+5 |
| |\| | |||||
| | * | mesa xkeyboard-config git update 30 May 2012 | marha | 2012-05-30 | 2 | -4/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-10 | 1 | -1/+1 |
| |\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| | * | fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012 | marha | 2012-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | synchronised gen.bat with makefile | marha | 2012-03-28 | 2 | -0/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-28 | 8 | -24/+229 |
| |\| | |||||
| | * | fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012 | marha | 2012-03-27 | 8 | -24/+229 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 6 | -3/+103 |
| |\| | | | | | | | | | | | | | | | 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 | 6 | -3/+103 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-24 | 1 | -1/+1 |
| |\| | |||||
| | * | fontconfig libX11 pixman xserver git update 24 Feb 2012 | marha | 2012-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-25 | 1 | -0/+6 |
| |\| | |||||
| | * | mesa git update 25 jan 2012 | marha | 2012-01-25 | 1 | -0/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 1 | -6/+0 |
| |\| | |||||
| | * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 1 | -6/+0 |
| | | | |||||
| * | | Back previous version | marha | 2011-12-23 | 1 | -0/+1 |
| | | | |||||
| * | | synchronised files | marha | 2011-12-23 | 1 | -1/+0 |
| | | | |||||
| * | | Synchronised files | marha | 2011-12-15 | 1 | -2/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-14 | 7 | -846/+868 |
| |\| | | | | | | | | | | | | | | | | | 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 | 8 | -831/+862 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-05 | 2 | -2/+6 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| | * | xserver xkeyboard-config mesa git update 5 dec 2011 | marha | 2011-12-05 | 2 | -2/+6 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-28 | 2 | -0/+14 |
| |\| | |||||
| | * | mesa git update 28 nov 2011 | marha | 2011-11-28 | 2 | -0/+14 |
| | | | |||||
| * | | Synchronised files | marha | 2011-11-07 | 8 | -24/+49 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 4 | -0/+78 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -0/+78 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 3 | -118/+190 |
| |\| | | | | | | | | | | | | | | | | | 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 | ||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |