Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 1 | -1/+3 |
|\ | | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore | ||||
| * | libxcb mesa pixman xkeyboard-config git update 1 oct 2012 | marha | 2012-10-01 | 1 | -1/+3 |
| | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 1 | -5/+0 |
|\| | | | | | | | | | | | 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 | -5/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 1 | -2/+1 |
|\| | |||||
| * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 1 | -2/+1 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -0/+4 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -9/+41 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -0/+4 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -9/+41 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-16 | 1 | -3/+103 |
|\| | |||||
| * | libxcb xserver mesa git update 16 Aug 2012 | marha | 2012-08-16 | 1 | -3/+103 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 1 | -12/+32 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 1 | -12/+32 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 1 | -2/+2 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 1 | -1/+1 |
|\| | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-28 | 1 | -4/+7 |
|\| | |||||
| * | xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012 | marha | 2012-06-28 | 1 | -4/+7 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-22 | 1 | -0/+240 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore | ||||
| * | mesa xserver libxcb fontconfig | marha | 2012-06-22 | 1 | -0/+240 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 1 | -0/+10 |
|\| | |||||
| * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 1 | -0/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 1 | -10/+10 |
|\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 1 | -10/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 1 | -0/+19 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+19 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-13 | 1 | -0/+30 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012 | marha | 2012-04-13 | 1 | -0/+30 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-03-05 | 1 | -6/+6 |
|\| | |||||
| * | libfontenc xserver pixman mesa git update 5 Mar 2012 | marha | 2012-03-05 | 1 | -6/+6 |
| | | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-06 | 1 | -93/+45 |
|\| | |||||
| * | mesa git update 6 feb 2012 | marha | 2012-02-06 | 1 | -93/+45 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-28 | 1 | -7/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -7/+20 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-20 | 1 | -13/+31 |
|\| | |||||
| * | xserver xkeyboard-config git update 20 jan 2012 | marha | 2012-01-20 | 1 | -13/+31 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 1 | -1/+4 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 1 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 1 | -7/+11 |
|\| | | | | | | | | | | | 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 | 1 | -7/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-29 | 1 | -20/+6 |
|\| | |||||
| * | mesa git update 29 nov 2011 | marha | 2011-11-29 | 1 | -20/+6 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -1/+12 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -1/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -2/+2 |
|\| | | | | | | | | | | | | | | | | | 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 | -2/+2 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-20 | 1 | -0/+11 |
|\| | |||||
| * | libX11 libxtrans mesa git update 20 sep 2011 | marha | 2011-09-20 | 1 | -0/+11 |
| | |