aboutsummaryrefslogtreecommitdiff
path: root/libX11
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-011-13/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-011-13/+5
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-231-59/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/state.c mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/state_tracker/st_format.h pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-arm-neon.c pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-fast-path.h pixman/pixman/pixman.h xorg-server/configure.ac xorg-server/hw/xwin/man/XWin.man xorg-server/manpages.am
| * libX11 mesa pixman xserver git update 23 June 2011marha2011-06-231-59/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-203-208/+262
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c
| * libX11 xserver mesa git update 20 June 2011marha2011-06-203-208/+262
| |
* | 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-0817-5681/+5739
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.xml libX11/specs/libX11/CH03.xml libX11/specs/libX11/CH04.xml libX11/specs/libX11/CH05.xml libX11/specs/libX11/CH06.xml libX11/specs/libX11/CH07.xml libX11/specs/libX11/CH08.xml libX11/specs/libX11/CH09.xml libX11/specs/libX11/CH11.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c
| * xserver libX11 mesa git update 8 Jun 2011marha2011-06-0817-5681/+5739
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-052-1627/+1627
|\| | | | | | | | | | | | | | | | | | | 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-052-1627/+1627
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-292-2/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in
| * libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011marha2011-05-292-2/+3
| |
* | merge ^/branches/released .marha2011-05-2516-3077/+3077
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-2516-57818/+57818
| |
* | svn merge ^/branches/released .marha2011-05-2210-59/+124
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-2210-59/+124
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-188-641/+641
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-188-1508/+1508
| |
* | merge ^/branches/released .marha2011-05-121-0/+1
|\|
* | Solved compilation warningsmarha2011-05-102-1/+2
| |
* | Solved compiler warningmarha2011-05-091-0/+1
| |
* | Removed compile time warningsmarha2011-05-098-0/+8
| |
* | svn merge ^/branches/released .marha2011-05-091-0/+5
|\|
| * libXext libX11 mkfontscale mesa git update 9 May 2011marha2011-05-091-0/+5
| |
* | Bumped version to 1.10.11.10.1marha2011-05-053-4/+4
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
| * libX11 libxcb mesa git update 5 May 2011marha2011-05-053-1179/+1179
| |
* | svn merge ^/branches/released .marha2011-05-041-1/+1
|\|
| * libX11 mesa glproto git update 4 May 2011marha2011-05-041-1397/+1397
| |
* | svn merge ^/branches/released .marha2011-04-2727-14821/+14661
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2727-6144/+5984
| |
* | svn merge ^/branches/released .marha2011-04-1510-3496/+3513
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-1510-5550/+5567
| |
* | svn merge ^/branches/released .marha2011-04-137-1627/+1619
|\|
| * xkeyboard-config libxcb libX11 git update 13 April 2011marha2011-04-137-16/+8
| |
* | svn merge ^/branches/released .marha2011-04-061-1/+1
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-486/+486
| |
* | svn merge ^/branches/released .marha2011-04-017-157/+176
|\|
| * libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 ↵marha2011-04-017-675/+694
| | | | | | | | Apr 2011
* | svn merge ^/branches/released .marha2011-03-241-0/+1
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-241-1077/+1078
| |
* | svn merge ^/branches/released .marha2011-03-201-485/+485
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-201-485/+485
| |
* | svn merge ^/branches/released .marha2011-03-171-2165/+2177
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-1/+13
| |
* | svn merge ^/branches/released .marha2011-03-151-2/+13
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-2/+13
| |
* | XKB_INSERVER is already defined in main makefilemarha2011-03-152-2/+0
| |
* | svn merge ^/branches/released .marha2011-03-123-1417/+1424
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 10:27:05 +0000