aboutsummaryrefslogtreecommitdiff
path: root/libXext
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-09-261-34/+34
|\ | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-261-34/+34
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-225-19/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-19/+43
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1951-9260/+9271
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1951-9260/+9271
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-164-13/+21
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-164-13/+21
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-156-1020/+1034
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-156-1020/+1034
| |
* | Synchronised line endinge with release branchmarha2011-09-128-1388/+1388
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-261-11/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH11.xml mesalib/src/glsl/main.cpp mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/get.c mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.h xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Resources/French.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/French.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/German.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/German.lproj/main.nib/designable.nib xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/locversion.plist xorg-server/hw/xquartz/bundle/Resources/Japanese.lproj/main.nib/designable.nib xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/man/Xquartz.man xorg-server/hw/xquartz/xpr/dri.c xorg-server/xkeyboard-config/symbols/ee
| * libX11 libXext mesa pixman xserver xkeyboard-config git update 26 July 2011marha2011-07-261-11/+20
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-132-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/configure.ac X11/xtrans/configure.ac X11/xtrans/doc/Makefile.am libX11/configure.ac libX11/docbook.am libXdmcp/configure.ac libXdmcp/doc/Makefile.am libXext/configure.ac libXext/docbook.am libXmu/configure.ac libXmu/doc/Makefile.am mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/state_tracker/st_draw.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst xorg-server/xkeyboard-config/symbols/de
| * libX11 mesa xkeyboard-config libXmu libXext libXdmcp libxtrans x11proto git ↵marha2011-06-132-3/+3
| | | | | | | | update 13 Jun 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-054-2537/+2537
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-054-2537/+2537
| |
* | svn merge ^/branches/released .marha2011-05-093-98/+98
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-093-3/+3
| |
* | svn merge ^/branches/released .marha2011-04-124-13/+27
|\|
| * mesa libXext pixman git update 12 Apr 2011marha2011-04-124-848/+862
| |
* | svn merge ^/branches/released .marha2011-04-013-102/+152
|\|
| * libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵marha2011-04-013-66/+116
| | | | | | | | Apr 2011
* | svn merge ^/branches/released .marha2011-02-281-1/+1
|\|
| * xserver libX11 Xextproto mesa Git update 28 Feb 2011marha2011-02-281-365/+365
| |
* | svn merge ^/branches/released .marha2011-02-031-56/+50
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-56/+50
| |
* | svn merge ^/branches/released .marha2011-01-291-7/+1
|\|
| * libXext libfontenc libXau libX11 libXinerama mesa libXdmcp git update 28 jan ↵marha2011-01-291-7/+1
| | | | | | | | 2011
* | svn merge ^/branches/released .marha2010-12-232-1390/+0
|\|
| * xserver libXext git update 20-12-2010marha2010-12-202-1390/+0
| |
* | svn merge ^/branches/released .marha2010-12-195-32/+35
|\|
| * libXext libXdmcp pixman git update 29/12/2010marha2010-12-195-32/+35
| |
* | svn merge ^/branches/released .marha2010-12-085-30/+1221
|\|
| * libXext xserver pixman git update 6-12-2010marha2010-12-065-30/+1221
| |
* | svn merge ^/branches/released .marha2010-11-3014-14/+14
|\|
| * libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010marha2010-11-2614-14/+14
| |
* | svn merge "^/branches/released" .marha2010-11-151-5/+2
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-141-5/+2
| |
* | svn merge ^/branches/released .marha2010-10-291-1/+1
|\|
| * libXext libX11 libXdmcp libXinerama pixman update 28/10/2010marha2010-10-281-1/+1
| |
* | svn merge ^/branches/released .marha2010-10-0757-3363/+3214
|\|
| * libXext xserver libXau libXinerama update 7/10/2010marha2010-10-0757-3363/+3214
| |
* | svn merge ^/branches/released .marha2010-08-1836-62/+108
|\|
| * libxext libx11 libxcb libXinerama libXau pixman xserver git update 18/10/2010marha2010-08-1836-62/+108
| |
* | svn merge ^/branches/released .marha2010-08-072-114/+76
|\|
| * libXext xserver libX11 libXdmcp libxcb git update 7/8/2010marha2010-08-072-114/+76
| |
* | svn merge ^/branches/released .marha2010-07-097-0/+3990
|\|
| * git update 9/7/2010marha2010-07-097-0/+3990
| |
* | svn merge ^/branches/released .marha2010-07-0813-5561/+5537
|\|