aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-10-191-0/+13
|\ | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-191-0/+13
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-102-1386/+1367
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-102-1386/+1367
| |
* | 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-261-0/+8
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-261-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-221-5382/+5386
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-221-5382/+5386
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-293-543/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c libX11/configure.ac libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.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/CH12.xml libX11/specs/libX11/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml libxcb/configure.ac libxcb/src/c_client.py libxcb/src/xcb_auth.c libxcb/src/xcb_util.c mesalib/common.py mesalib/configs/linux-dri mesalib/docs/GL3.txt mesalib/docs/download.html mesalib/docs/install.html mesalib/include/GL/internal/dri_interface.h mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp-parse.y 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_clone.cpp mesalib/src/glsl/ir_print_visitor.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/glsl/opt_tree_grafting.cpp mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_XML.py mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mapi/mapi/u_thread.c mesalib/src/mapi/mapi/u_thread.h mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c mesalib/src/mesa/main/api_arrayelt.c mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pbo.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shared.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/program/register_allocate.c mesalib/src/mesa/program/register_allocate.h mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/tnl/t_draw.c mesalib/src/mesa/vbo/vbo_exec_array.c mesalib/src/mesa/vbo/vbo_save_api.c pixman/pixman/pixman-arm-common.h pixman/pixman/pixman-fast-path.c pixman/pixman/pixman-inlines.h pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h xorg-server/configure.ac xorg-server/fb/fbblt.c xorg-server/hw/xquartz/darwin.c xorg-server/xkeyboard-config/symbols/de
| * xwininfo libX11 libXmu libxcb mesa xserver xkeyboard-config git update 29marha2011-08-293-543/+3
| | | | | | | | aug 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-202-141/+203
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-141/+203
| |
* | svn merge ^/branches/released .marha2011-01-291-1/+1
|\|
| * libXext libfontenc libXau libX11 libXinerama mesa libXdmcp git update 28 jan ↵marha2011-01-291-1/+1
| | | | | | | | 2011
* | svn merge ^/branches/released .marha2010-10-291-0/+2
|\|
| * libXext libX11 libXdmcp libXinerama pixman update 28/10/2010marha2010-10-281-0/+2
| |
* | svn merge ^/branches/released .marha2010-10-101-11/+3
|\|
| * libX11 update 10/10/2010marha2010-10-101-11/+3
| |
* | svn merge ^/branches/released .marha2010-09-22125-611/+563
|\|
| * libX11 22/9/2010marha2010-09-2264-288/+544
| |
* | svn merge ^/branches/released .marha2010-09-101-1381/+1383
|\|
| * libX11 git update 10/9/2010marha2010-09-101-1381/+1383
| |
* | svn merge ^/branches/released .marha2010-09-041-156/+156
|\|
| * libx11 git update 4/9/2010marha2010-09-041-156/+156
| |
* | svn merge ^/branches/released .marha2010-08-291-0/+1
|\|
| * libx11 git update 29/8/2010marha2010-08-291-0/+1
| |
* | svn merge ^/branches/released .marha2010-08-021-1/+1
|\|
| * xserver libX11 libXdmcp git update 2-8-2010marha2010-08-021-1/+1
| |
* | svn merge ^/branches/released .marha2010-07-201-0/+1
|\|
| * libX11 git update 20/7/2010marha2010-07-201-0/+1
| |
* | svn merge ^/branches/released .marha2010-07-091-2/+2
|\|
| * git update 9/7/2010marha2010-07-091-2/+2
| |
* | svn merge ^/branches/released .marha2010-06-301-2/+8
|\|
| * git update 30/6/2010marha2010-06-301-2/+8
| |
* | svn merge ^/branches/released .marha2010-06-141-2/+110
|\|
| * libX11 git update 14/6/2010marha2010-06-141-2/+110
| |
* | svn merge "^/branches/released" .marha2010-05-1963-48209/+5693
|\|
| * libX11 git update 19/10/2010marha2010-05-1963-48209/+5693
| |
* | svn merge ^/branches/released .marha2010-01-20160-508/+346
|\|
| * Updated to:marha2010-01-19160-508/+346
| | | | | | | | | | | | libX11-1.3.3 pixman-0.17.4
| * Updated to libX11-1.3.2marha2009-10-291-0/+3
| |
* | svn merge ^/branches/releasedmarha2009-10-291-0/+3
| |
* | Delete temperary files.marha2009-10-211-3/+9
| |
* | Now compile complete localemarha2009-10-2159-1/+372
| |
* | svn merge ^/branches/releasedmarha2009-10-1862-982/+738
|\|
| * Updated following packages:marha2009-10-1862-982/+738
| | | | | | | | | | | | | | libX11-1.3.1 xtrans-1.2.5