Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-09-24 | 13 | -593/+388 |
|\ | | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c | ||||
| * | mesa pixman xserver git update 24 sep 2012 | marha | 2012-09-24 | 13 | -593/+388 |
| | | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-20 | 3 | -31/+16 |
|\| | | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c | ||||
| * | libxcb xserver pixman mesa git update 20 sep 2012 | marha | 2012-09-20 | 3 | -31/+16 |
| | | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-09-17 | 5 | -14/+21 |
|\| | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c | ||||
| * | mesa xserver pixman git update 17 sep 2012 | marha | 2012-09-17 | 5 | -23/+32 |
| | | |||||
| * | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-08-31 | 1 | -17/+15 |
| | | | | | | | | git update 31 Aug 2012 | ||||
| * | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-08-27 | 1 | -271/+0 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xserver | marha | 2012-09-04 | 1 | -17/+15 |
| | | | | | | | | git update 31 Aug 2012 | ||||
* | | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman | marha | 2012-09-04 | 1 | -271/+0 |
| | | | | | | | | xkeyboard-config git update 27 Aug 2012 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-21 | 1 | -4/+0 |
|\| | |||||
| * | xserver xkeyboard-config mesa pixman git update 21 Aug 2012 | marha | 2012-08-21 | 1 | -4/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-13 | 7 | -26/+163 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 13 Aug 2012 | marha | 2012-08-13 | 7 | -26/+163 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-08-03 | 6 | -5/+14 |
|\| | |||||
| * | pixman mesa git update 3 Aug 2012 | marha | 2012-08-03 | 6 | -5/+14 |
| | | |||||
* | | Solved compile errors | marha | 2012-08-01 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-31 | 14 | -19/+476 |
|\| | |||||
| * | fontconfig libXext mesa xserver pixman git update 31 Jul 2012 | marha | 2012-07-31 | 14 | -19/+476 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-11 | 2 | -193/+157 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/devices.c | ||||
| * | mesa xserver pixman git update 11 Jul 2012 | marha | 2012-07-11 | 2 | -193/+157 |
| | | |||||
* | | synchronised pixman/pixman/makefile pixman/pixman/makefile.sources | marha | 2012-07-09 | 1 | -1/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-09 | 17 | -845/+1724 |
|\| | | | | | | | | | | | 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 | 17 | -845/+1724 |
| | | |||||
* | | Solved compilation warnings introduced in latest merge | marha | 2012-07-02 | 1 | -0/+1 |
| | | |||||
* | | Solved compilation errors due to latest merge | marha | 2012-07-02 | 1 | -12/+15 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-07-02 | 12 | -183/+645 |
|\| | | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c | ||||
| * | mesa pixman xserver git update 2 Jul 2012 | marha | 2012-07-02 | 12 | -183/+645 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-29 | 3 | -12/+72 |
|\| | | | | | | | | | | | 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 | 3 | -12/+72 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-21 | 1 | -1/+5 |
|\| | |||||
| * | mesa pixman xkeyboard-config xserver git update 21 Jun 2012 | marha | 2012-06-21 | 1 | -1/+5 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-18 | 2 | -0/+85 |
|\| | |||||
| * | fontconfig mesa pixman git update 18 Jun 2012 | marha | 2012-06-18 | 2 | -0/+85 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-15 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-12 | 6 | -117/+136 |
|\| | |||||
| * | fontconfig mesa pixman git update 12 Juni 2012 | marha | 2012-06-12 | 6 | -117/+136 |
| | | |||||
* | | Synchronised makefile with Makefile.sources | marha | 2012-06-11 | 1 | -27/+34 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-11 | 15 | -79/+1344 |
|\| | | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore | ||||
| * | fontconfig glproto mesa pixman git update 11 Jun 2012 | marha | 2012-06-11 | 15 | -79/+1344 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-08 | 17 | -3472/+3553 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 17 | -3472/+3553 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-06-04 | 12 | -633/+628 |
|\| | |||||
| * | fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4 | marha | 2012-06-04 | 12 | -633/+628 |
| | | | | | | | | May 2012 | ||||
* | | Solved compilation errors | marha | 2012-05-29 | 1 | -10/+14 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-29 | 7 | -48/+346 |
|\| | | | | | | | | | | | 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 | 7 | -45/+347 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-05-25 | 4 | -32/+205 |
|\| | |||||
| * | fontconfig xserver xkeyboard-config pixman git update 2012 | marha | 2012-05-25 | 4 | -32/+205 |
| | |