aboutsummaryrefslogtreecommitdiff
path: root/X11
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-02-131-2/+17
|\
| * Updated to inputproto-2.1.99.6marha2012-02-131-2/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-233-0/+115
|\|
| * Added xf86bigfontproto-1.2.0marha2012-01-233-0/+115
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-131-32/+33
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c
| * libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012marha2012-01-131-32/+33
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-111-0/+1
|\|
| * Switched to inputproto-2.1.99.5marha2012-01-111-0/+1
| |
* | Synchronised filesmarha2011-12-2327-154/+122
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-233-10/+20
|\|
| * Updated to inputproto-2.1.99.4marha2011-12-233-20/+20
| |
* | Solved compilation warnings1.11.3.0marha2011-12-172-2/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-171-6/+8
|\|
| * libX11 libxtrans mesa xserver git update 17 dec 2011marha2011-12-171-6/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-126-137/+117
|\|
| * libxtrans libX11 libxcb xserver mesa git update 12 dec 2011marha2011-12-126-137/+117
| |
* | Solved compile errormarha2011-10-061-0/+5
| |
* | Removed check in Xi versionmarha2011-10-061-10/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-063-23/+129
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-063-23/+129
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-059-684/+664
|\| | | | | | | | | | | | | | | | | 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-059-684/+664
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-222-29/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-222-29/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-201-2/+2
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-201-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-199-300/+300
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-199-300/+300
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-1615-11279/+0
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-1615-11279/+0
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-152-59/+72
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-152-59/+72
| |
* | Synchronised line endinge with release branchmarha2011-09-1233-9871/+9871
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-092-5/+88
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/randr.h mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_program.c
| * xrandrproto mesa git update 9 aug 2011marha2011-08-092-5/+88
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-041-2618/+2634
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/mesa/program/ir_to_mesa.cpp xorg-server/composite/compalloc.c xorg-server/configure.ac xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Makefile.am xorg-server/hw/xquartz/xpr/xprFrame.c xorg-server/include/windowstr.h
| * randrproto mesa xserver git update 4 aug 2011marha2011-08-041-2618/+2634
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-1818-1424/+2734
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/Xfuncproto.h.in X11/configure.ac X11/keysymdef.h freetype/include/freetype/internal/pcftypes.h freetype/src/cache/ftcbasic.c freetype/src/cache/ftccmap.c mesalib/src/glsl/ir.h mesalib/src/glsl/link_functions.cpp mesalib/src/mesa/main/dlist.c mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_program.c pthreads/Makefile
| * Update following xorg packagesmarha2011-07-1818-1424/+2734
| | | | | | | | | | | | inputproto-2.0.2 xproto-7.0.22 resourceproto-1.2.0
* | Merge remote-tracking branch 'origin/released'marha2011-06-135-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-8/+10
| | | | | | | | update 13 Jun 2011
* | Increased maximum number of clients to 1024marha2011-06-081-1/+1
| |
* | Increased number of clients to 256marha2011-06-081-0/+2
| |
* | Synchronised filesmarha2011-05-241-1/+6
| |
* | svn merge ^/branches/released .marha2011-05-221-5/+0
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-2623/+2618
| | | | | | | | May 2011
* | Synchronised filemarha2011-05-051-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-041-1/+1
|\|
* | svn merge ^/branches/released .marha2011-04-273-414/+442
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-273-0/+28
| |