| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/released' | marha | 2012-08-07 | 20 | -259/+499 |
| |\ | | | | | | | | | | | | | | | | | | | | | 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 | 20 | -259/+499 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 34 | -459/+613 |
| |\| | |||||
| | * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 34 | -459/+613 |
| | | | |||||
| * | | Solved compile errors | marha | 2012-08-01 | 2 | -0/+4 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-01 | 14 | -79/+431 |
| |\| | |||||
| | * | git mesa update 1 Aug 2012 | marha | 2012-08-01 | 14 | -79/+431 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 120 | -2427/+3768 |
| |\| | |||||
| | * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 120 | -2427/+3768 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-18 | 14 | -37/+121 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 14 | -37/+121 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-16 | 19 | -304/+352 |
| |\| | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore | ||||
| | * | libX11 mesa git update 16 Jul 2012 | marha | 2012-07-16 | 19 | -304/+352 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-13 | 43 | -311/+1228 |
| |\| | | | | | | | | | | | Conflicts: xorg-server/glx/glxext.c xorg-server/hw/xwin/InitOutput.c | ||||
| | * | xserver mesa git update 13 Jul 2012 | marha | 2012-07-13 | 43 | -311/+1228 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-12 | 7 | -82/+266 |
| |\| | |||||
| | * | mesa xserver git update 12 Jul 2012 | marha | 2012-07-12 | 7 | -82/+266 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 15 | -14/+376 |
| |\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| | * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 15 | -14/+376 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 8 | -67/+205 |
| |\| | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -67/+205 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 1 | -3/+5 |
| |\| | | | | | | | | | | | 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 | 1 | -3/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-06 | 9 | -43/+417 |
| |\| | | | | | | | | | | | | | | | 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 | -43/+417 |
| | | | |||||
| * | | 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 | 55 | -298/+821 |
| |\| | |||||
| | * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 55 | -298/+821 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 35 | -524/+846 |
| |\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| | * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 35 | -502/+824 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 19 | -110/+261 |
| |\| | |||||
| | * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 19 | -110/+261 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-19 | 54 | -997/+1025 |
| |\| | |||||
| | * | mesa git update 19 Juni 2012 | marha | 2012-06-19 | 54 | -997/+1025 |
| | | | |||||
| * | | 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 | 87 | -1608/+2029 |
| |\| | | | | | | | | | | | | | | | 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 | 87 | -1608/+2029 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 131 | -2530/+377 |
| |\| | |||||
| | * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 131 | -2530/+377 |
| | | | |||||
| * | | 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 | 321 | -54365/+54762 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 322 | -54376/+54787 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 13 | -13/+144 |
| |\| | |||||
 |
index : vcxsrv | |
| VcXsrv Windows X Server (X2Go/Arctica Builds) |
| aboutsummaryrefslogtreecommitdiff |