Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
|\| | ||||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 13 | -13/+144 | |
| | | | | | | | | 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 | 2 | -1/+16 | |
| | | ||||||
* | | 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 | 20 | -103991/+427 | |
|\| | ||||||
| * | mesa xkeyboard-config git update 30 May 2012 | marha | 2012-05-30 | 20 | -103991/+427 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | Updated mesa project files | marha | 2012-05-29 | 4 | -0/+12 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 21 | -166/+280 | |
|\| | ||||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 21 | -166/+280 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-21 | 30 | -684/+1255 | |
|\| | ||||||
| * | fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012 | marha | 2012-05-21 | 30 | -684/+1255 | |
| | | ||||||
* | | Updated mesa project file | marha | 2012-05-16 | 4 | -8/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-15 | 43 | -1702/+1838 | |
|\| | ||||||
| * | 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 | 34 | -1491/+1661 | |
| | | ||||||
* | | 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 | 45 | -555/+831 | |
|\| | ||||||
| * | libX11 mesa xserver xkeyboard-config | marha | 2012-05-09 | 38 | -539/+724 | |
| | | ||||||
| * | xserver mesa git update 3 May 2012 | marha | 2012-05-03 | 7 | -16/+107 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-02 | 4 | -13/+10 | |
|\| | | | | | | | | | Conflicts: xorg-server/os/connection.c | |||||
| * | fontconfig mesa xserver xkeyboard-config git update 2 May 2012 | marha | 2012-05-02 | 4 | -13/+10 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-30 | 24 | -647/+632 | |
|\| | | | | | | | | | | | 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 | 24 | -647/+632 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-23 | 8 | -19/+15 | |
|\| | ||||||
| * | fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012 | marha | 2012-04-23 | 8 | -19/+15 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-20 | 39 | -1280/+1281 | |
|\| | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c | |||||
| * | fontconfig libX11 mesa pixman xserver git update 20 april 2012 | marha | 2012-04-20 | 39 | -1280/+1281 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-17 | 7 | -70/+21 | |
|\| | ||||||
| * | fontconfig mesa git update 17 Apr 2012 | marha | 2012-04-17 | 7 | -70/+21 | |
| | | ||||||
* | | Added ir_builder.cpp to project | marha | 2012-04-16 | 4 | -0/+8 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-04-16 | 35 | -406/+848 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/securitysrv.h xorg-server/glx/glxext.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_size_get.c xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winglobals.h xorg-server/hw/xwin/winmonitors.h xorg-server/include/closestr.h xorg-server/include/pixmapstr.h xorg-server/include/servermd.h xorg-server/include/site.h xorg-server/include/windowstr.h xorg-server/include/xkbstr.h |