| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 1 | -32/+42 |
| |\ | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| | * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 1 | -32/+42 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-05 | 2 | -2/+11 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c | ||||
| | * | xserver mesa git update 4 sep 2012 | marha | 2012-09-05 | 2 | -2/+11 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 1 | -1/+1 |
| |\| | |||||
| | * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 1 | -4/+7 |
| |\| | |||||
| | * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 1 | -4/+7 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 12 | -240/+253 |
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h | ||||
| | * | mesa xserver xkeyboard-config git update 7 Aug 2012 | marha | 2012-08-07 | 12 | -240/+253 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 2 | -112/+1 |
| |\| | |||||
| | * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 2 | -112/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 2 | -8/+9 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c | ||||
| | * | fontconfig mesa xserver git update 18 Jul 2012 | marha | 2012-07-18 | 2 | -8/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 4 | -2/+23 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| | * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 4 | -2/+23 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-12 | 4 | -4/+21 |
| |\| | |||||
| | * | mesa xserver git update 12 Jul 2012 | marha | 2012-07-12 | 4 | -4/+21 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 101 | -27269/+2750 |
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c | ||||
| | * | fontconfig mesa xserver git update 10 Jul 2012 | marha | 2012-07-10 | 101 | -27269/+2750 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 23 | -69/+1036 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h | ||||
| | * | fontconfig libX11 mesa pixman xserver git update 9 Jul 2012 | marha | 2012-07-09 | 23 | -69/+1036 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 9 | -45/+36 |
| |\| | | | | | | | | | | | | | | | 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 | 9 | -45/+36 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 11 | -24/+27 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| | * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 11 | -24/+27 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 2 | -27/+5 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c | ||||
| | * | xkeyboard-config xserver pixman mesa git update 29 Jun 2012 | marha | 2012-06-29 | 2 | -27/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 15 | -30/+0 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| | * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 15 | -30/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 2 | -8/+36 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 2 | -8/+36 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 3 | -5/+22 |
| |\| | | | | | | | | | | | | | | | 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 | -5/+22 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 90 | -5816/+5789 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 90 | -5816/+5789 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 3 | -1/+99 |
| |\| | |||||
| | * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 3 | -1/+99 |
| | | | | | | | | | May 2012 | ||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 1 | -16/+78 |
| |\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c | ||||
| | * | fontconfig libX11 mesa pixman xserver git update 29 May 2012 | marha | 2012-05-29 | 1 | -16/+78 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 40 | -158/+184 |
| |\| | |||||
| | * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 40 | -158/+184 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 3 | -3/+4 |
| |\| | |||||
| | * | xserver mesa git update 15 May 2012 | marha | 2012-05-15 | 3 | -3/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 1 | -2/+2 |
| |\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| | * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-09 | 1 | -2/+2 |
| |\| | |||||
| | * | libX11 mesa xserver xkeyboard-config | marha | 2012-05-09 | 1 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 2 | -4/+10 |
| |\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c | ||||
| | * | fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012 | marha | 2012-04-30 | 2 | -4/+10 |
| | | | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |