Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-03-12 | 2 | -1502/+1483 |
|\ | | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in | ||||
| * | xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012 | marha | 2012-03-12 | 2 | -1498/+1479 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-24 | 1 | -1/+1 |
|\| | |||||
| * | fontconfig libX11 pixman xserver git update 24 Feb 2012 | marha | 2012-02-24 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-22 | 4 | -436/+436 |
|\| | |||||
| * | fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012 | marha | 2012-02-22 | 4 | -436/+436 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-13 | 2 | -33/+33 |
|\| | |||||
| * | libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012 | marha | 2012-02-13 | 2 | -33/+33 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-02-09 | 1 | -0/+67 |
|\| | |||||
| * | libX11 git update 9 feb 2012 | marha | 2012-02-09 | 1 | -0/+67 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-24 | 2 | -49/+50 |
|\| | | | | | | | | | Conflicts: xorg-server/dix/grabs.c | ||||
| * | libX11 mesa xserver git update 24 jan 2012 | marha | 2012-01-24 | 2 | -49/+50 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-23 | 34 | -2916/+3294 |
|\| | |||||
| * | git update libX11 mesa libxcb xkeyboard-config 23 jan 2012 | marha | 2012-01-23 | 34 | -2916/+3294 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-09 | 5 | -225/+234 |
|\| | |||||
| * | xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011 | marha | 2012-01-09 | 5 | -225/+234 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2012-01-06 | 1 | -2/+0 |
|\| | | | | | | | | | | | 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 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-29 | 1 | -1/+1 |
|\| | |||||
| * | xserver libX11 mesa xkeyboard-config git update 28 dec 2011 | marha | 2011-12-28 | 1 | -1/+1 |
| | | |||||
* | | Solved compilation error due to name conflict | marha | 2011-12-23 | 2 | -0/+8 |
| | | |||||
* | | Synchronised files | marha | 2011-12-23 | 1 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-17 | 1 | -77/+99 |
|\| | |||||
| * | libX11 libxtrans mesa xserver git update 17 dec 2011 | marha | 2011-12-17 | 1 | -77/+99 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-12 | 1 | -10/+42 |
|\| | |||||
| * | libxtrans libX11 libxcb xserver mesa git update 12 dec 2011 | marha | 2011-12-12 | 1 | -10/+42 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-08 | 1 | -1/+1 |
|\| | |||||
| * | git update glproto libX11 libxcb mesa xserver 8 dec 2011 | marha | 2011-12-08 | 1 | -1/+1 |
| | | |||||
* | | Solved possible build problem | marha | 2011-11-14 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-14 | 5 | -345/+350 |
|\| | | | | | | | | | Conflicts: libX11/src/util/makekeys.c | ||||
| * | libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git update | marha | 2011-11-14 | 5 | -344/+349 |
| | | | | | | | | 14 nov 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-10 | 1 | -96/+94 |
|\| | |||||
| * | libX11 mesa git update 10 nov 2011 | marha | 2011-11-10 | 1 | -96/+94 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 2 | -67/+65 |
|\| | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 2 | -67/+65 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 1 | -6/+3 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 1 | -6/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-19 | 9 | -2158/+2152 |
|\| | | | | | | | | | Conflicts: xorg-server/include/os.h | ||||
| * | libX11 libXext libXft mesa libxcb mkfontscale pixman xserver | marha | 2011-10-19 | 9 | -2158/+2152 |
| | | | | | | | | xkeyboard-config git update 19 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-10 | 51 | -6923/+6883 |
|\| | |||||
| * | fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011 | marha | 2011-10-10 | 51 | -6923/+6883 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | 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/+1 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-27 | 1 | -2/+0 |
|\| | | | | | | | | | | | | | | | | | 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 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-26 | 3 | -2/+10 |
|\| | | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c | ||||
| * | fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011 | marha | 2011-09-26 | 3 | -2/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 3 | -5391/+5397 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c | ||||
| * | libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 | marha | 2011-09-22 | 3 | -5391/+5397 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-20 | 7 | -48/+72 |
|\| |