Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2013-01-28 | 1 | -1/+24 |
|\ | | | | | | | | | * origin/released: mesa mkfontscale pixman git update 28 jan 2013 | ||||
| * | mesa mkfontscale pixman git update 28 jan 2013 | marha | 2013-01-28 | 1 | -1/+24 |
| | | | | | | | | | | | | mesa: 87592cff57feef29565150b9203e220b50623f30 mkfontscale: b3af8de8d25128f565c2ed2f7c63b6e4099eb84e pixman: 65fc1adb6545737058e938105ae948a3607c277c | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-12-17 | 1 | -0/+6 |
|\| | | | | | | | | | | | | | | | * origin/released: libXft pixman mesa git update 17 dec 2012 Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast.c | ||||
| * | libXft pixman mesa git update 17 dec 2012 | marha | 2012-12-17 | 1 | -0/+6 |
| | | | | | | | | | | | | libXft: 835cd2a6cb4aa8f89e6e7dead66483643a6e7ee8 pixman: 526dc06e5694172abf979c03a5cf530207fe2d27 mesa: 1358f3a905448f6fb546aba951e317f743a83c76 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-12-03 | 1 | -2/+2 |
|\| | | | | | | | | | * origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012 | ||||
| * | fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012 | marha | 2012-12-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-31 | 1 | -2/+0 |
|\| | | | | | | | | | * origin/released: mesa git update 31 oct 2012 | ||||
| * | mesa git update 31 oct 2012 | marha | 2012-10-31 | 1 | -2/+0 |
| | | | | | | | | mesa: 183e122bdfe27f875c3c121964484dae9587c051 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-10-01 | 1 | -22/+66 |
|\| | | | | | | | | | | | | | | | * 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 | -22/+66 |
| | | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-18 | 1 | -34/+24 |
|\| | |||||
| * | mesa git update 18 sep 2012 | marha | 2012-09-18 | 1 | -34/+24 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-06 | 1 | -3/+3 |
|\| | |||||
| * | xserver mesa git update 6 sep 2012 | marha | 2012-09-06 | 1 | -3/+3 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -1/+0 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -1/+0 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 1 | -15/+14 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 1 | -15/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 1 | -1/+1 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 1 | -0/+1 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 1 | -2/+10 |
|\| | |||||
| * | xserver mesa git update 15 May 2012 | marha | 2012-05-15 | 1 | -2/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 1 | -0/+1 |
|\| | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-26 | 1 | -2/+0 |
|\| | |||||
| * | xwininfo xcb-proto mesa xserver git update 26 12 2012 | marha | 2012-01-26 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-17 | 1 | -4/+2 |
|\| | |||||
| * | git update mesa pixman xserver 17 jan 2012 | marha | 2012-01-17 | 1 | -4/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 1 | -0/+5 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 1 | -0/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -1/+0 |
|\| | | | | | | | | | | | | | | | | | 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 | -1/+0 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-30 | 1 | -16/+4 |
|\| | | | | | | | | | Conflicts: openssl/Makefile | ||||
| * | mesa xkeyboard-config git update 30 sep 2011 | marha | 2011-09-30 | 1 | -16/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-29 | 1 | -1/+25 |
|\| | |||||
| * | xwininfo libXft mesa git update 29 sep 2011 | marha | 2011-09-29 | 1 | -1/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-28 | 1 | -0/+25 |
|\| | |||||
| * | mesa pixman xkeyboard-config git update 28 sep 2011 | marha | 2011-09-28 | 1 | -0/+25 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -293/+281 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c | ||||
| * | libX11 pixman mesa xserver git update 27 sep 2011 | marha | 2011-09-27 | 1 | -293/+281 |
| | | |||||
* | | Solved compilation problem | marha | 2011-04-07 | 1 | -1/+1 |
|/ | |||||
* | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 1 | -288/+293 |
| | |||||
* | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -285/+288 |
| | |||||
* | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -1/+2 |
| | |||||
* | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 1 | -284/+284 |
| | |||||
* | Updated to mesalib 7.9 | marha | 2010-11-22 | 1 | -23/+177 |
| |