aboutsummaryrefslogtreecommitdiff
path: root/libX11
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-122-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 2012marha2012-03-122-1498/+1479
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-241-1/+1
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-241-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-224-436/+436
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-224-436/+436
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-132-33/+33
|\|
| * libX11 libxcb mesa xserver mkfontscale git update 13 feb 2012marha2012-02-132-33/+33
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-091-0/+67
|\|
| * libX11 git update 9 feb 2012marha2012-02-091-0/+67
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-242-49/+50
|\| | | | | | | | | Conflicts: xorg-server/dix/grabs.c
| * libX11 mesa xserver git update 24 jan 2012marha2012-01-242-49/+50
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-2334-2916/+3294
|\|
| * git update libX11 mesa libxcb xkeyboard-config 23 jan 2012marha2012-01-2334-2916/+3294
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-095-225/+234
|\|
| * xwininfo libX11 mesa mkfontscale xkeyboard-config git update 9 jan 2011marha2012-01-095-225/+234
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-061-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 2012marha2012-01-061-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-291-1/+1
|\|
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-281-1/+1
| |
* | Solved compilation error due to name conflictmarha2011-12-232-0/+8
| |
* | Synchronised filesmarha2011-12-231-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-171-77/+99
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-171-77/+99
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-121-10/+42
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-121-10/+42
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-081-1/+1
|\|
| * git update glproto libX11 libxcb mesa xserver 8 dec 2011marha2011-12-081-1/+1
| |
* | Solved possible build problemmarha2011-11-141-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-145-345/+350
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-145-344/+349
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-101-96/+94
|\|
| * libX11 mesa git update 10 nov 2011marha2011-11-101-96/+94
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-092-67/+65
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-092-67/+65
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-6/+3
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-6/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-199-2158/+2152
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-199-2158/+2152
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1051-6923/+6883
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1051-6923/+6883
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-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 ↵marha2011-10-051-1/+1
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-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 2011marha2011-09-271-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-263-2/+10
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-263-2/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-223-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 2011marha2011-09-223-5391/+5397
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-207-48/+72
|\|