| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 8 | -31/+19 |
| |\ | | | | | | | | | | | | | | | 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 | 8 | -31/+19 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-04 | 9 | -46/+76 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/include/misc.h xorg-server/os/utils.c | ||||
| | * | mesa xserver git update 4 Jul 2012 | marha | 2012-07-04 | 9 | -46/+76 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-02 | 13 | -243/+252 |
| |\| | | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c | ||||
| | * | mesa pixman xserver git update 2 Jul 2012 | marha | 2012-07-02 | 13 | -243/+252 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 10 | -60/+107 |
| |\| | | | | | | | | | | | 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 | 10 | -60/+107 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 35 | -170/+322 |
| |\| | |||||
| | * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 35 | -170/+322 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 30 | -464/+822 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| | * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 30 | -442/+800 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 17 | -61/+260 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 17 | -61/+260 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-19 | 6 | -6/+50 |
| |\| | |||||
| | * | mesa git update 19 Juni 2012 | marha | 2012-06-19 | 6 | -6/+50 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 11 | -79/+161 |
| |\| | |||||
| | * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 11 | -79/+161 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 22 | -651/+1054 |
| |\| | | | | | | | | | | | | | | | 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 | 22 | -651/+1054 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 27 | -188/+204 |
| |\| | |||||
| | * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 27 | -188/+204 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 5 | -26/+25 |
| |\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| | * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 5 | -26/+25 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 292 | -44315/+44761 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 293 | -44326/+44786 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 11 | -12/+107 |
| |\| | |||||
| | * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 11 | -12/+107 |
| | | | | | | | | | May 2012 | ||||
| * | | Update filesthatshouldbethesame.py and synchronised files | marha | 2012-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | dispatch.h glapitable.h enums.c are now generated automatically | marha | 2012-05-30 | 1 | -0/+3 |
| | | | |||||
| * | | 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 | 17 | -103983/+407 |
| |\| | |||||
| | * | mesa xkeyboard-config git update 30 May 2012 | marha | 2012-05-30 | 17 | -103983/+407 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 1 | -3/+3 |
| |\| | | | | | | | | | | | 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 | -3/+3 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 16 | -160/+273 |
| |\| | |||||
| | * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 16 | -160/+273 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 27 | -682/+926 |
| |\| | |||||
| | * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 27 | -682/+926 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 41 | -1697/+1745 |
| |\| | |||||
| | * | xserver mesa git update 15 May 2012 | marha | 2012-05-15 | 9 | -211/+177 |
| | | | |||||
| | * | fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012 | marha | 2012-05-14 | 32 | -1486/+1568 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-10 | 1 | -3/+1 |
| |\| | | | | | | | | | Conflicts: xorg-server/os/log.c | ||||
| | * | xserver fontconfig mesa git update 10 May 2012 | marha | 2012-05-10 | 1 | -3/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-09 | 41 | -552/+815 |
| |\| | |||||
| | * | libX11 mesa xserver xkeyboard-config | marha | 2012-05-09 | 34 | -536/+708 |
| | | | |||||
| | * | xserver mesa git update 3 May 2012 | marha | 2012-05-03 | 7 | -16/+107 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 3 | -13/+9 |
| |\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | ||||
| | * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 3 | -13/+9 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 19 | -632/+602 |
| |\| | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c | ||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |