aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised glx files with mesamarha2011-09-064-1691/+2603
|
* Updated version of freetype in makefilesmarha2011-09-051-2/+2
|
* Version bumped to 1.11.0.0marha2011-09-052-2/+2
|
* Merge remote-tracking branch 'origin/released'marha2011-08-295-17/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-295-17/+24
| | | | | | | | aug 2011
* | Merge remote-tracking branch 'origin/released'marha2011-08-101-1413/+1417
|\| | | | | | | | | Conflicts: mesalib/docs/GL3.txt
| * mesa xserver git update 10 aug 2011marha2011-08-101-1413/+1417
| |
* | Update gl specsmarha2011-08-093-13/+640
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-083-60/+75
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_optimize.c mesalib/src/mesa/state_tracker/st_cb_blit.c xorg-server/xkeyboard-config/rules/base.o_s.part xorg-server/xkeyboard-config/rules/base.xml.in
| * mesa xkeyboard-config git update 8 aug 2011marha2011-08-083-60/+75
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-047-931/+946
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-047-931/+946
| |
* | Solved compile problems: AbrtDDX now has the exit code as parametermarha2011-08-013-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-0124-8205/+8226
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texparam.c xorg-server/config/udev.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/src/kdrive.c xorg-server/hw/xfree86/common/xf86Config.c xorg-server/hw/xfree86/common/xf86Configure.c xorg-server/hw/xfree86/common/xf86Helper.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/common/xf86Option.c xorg-server/hw/xfree86/common/xf86Priv.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/xlaunch/config.cc xorg-server/hw/xwin/xlaunch/config.h xorg-server/hw/xwin/xlaunch/main.cc xorg-server/hw/xwin/xlaunch/resources/dialog.rc xorg-server/hw/xwin/xlaunch/resources/resources.h xorg-server/hw/xwin/xlaunch/resources/resources.rc xorg-server/hw/xwin/xlaunch/resources/strings.rc xorg-server/hw/xwin/xlaunch/window/util.cc xorg-server/hw/xwin/xlaunch/window/util.h xorg-server/hw/xwin/xlaunch/window/wizard.h xorg-server/include/os.h xorg-server/os/log.c xorg-server/xkeyboard-config/symbols/lv
| * mesa xserver pixman xkeyboard-config git update 1 aug 2011marha2011-08-0146-11719/+8204
| |
* | Solvedm problem of window not taking the default window position whenmarha2011-07-271-4/+9
| | | | | | | | created.
* | Merge remote-tracking branch 'origin/released'marha2011-07-2699-32272/+42803
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2699-32272/+42803
| |
* | Use AllocDevicePair for create the mouse and keyboard devicesmarha2011-07-261-4/+10
| |
* | Fix for possible run-time type cast problem in debugmarha2011-07-261-1/+1
| |
* | Use logical bit and instead of arithmatic bit andmarha2011-07-221-3/+3
| |
* | Installer: installation of fonts is optional nowmarha2011-07-201-2/+10
| |
* | Increased version 1.10.3.1marha2011-07-182-2/+2
| |
* | freetype244 -> freetype245marha2011-07-181-2/+2
| |
* | synchronised file (different file format: dos <> unix)marha2011-07-181-180/+180
| |
* | Solved regression in commit 31ee9c57db79281e122d3c4acb0f8eae07f4449fmarha2011-07-151-3/+0
| | | | | | | | This caused some windows to catolised as gl windows which were not.
* | Merge remote-tracking branch 'origin/released'marha2011-07-153-5/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
| * xserver libX11 mesa git update 15 Julymarha2011-07-153-5/+55
| |
* | Solved possible crash because of invalid valdata pointersmarha2011-07-152-5/+11
| |
* | Reverted commit 3bbcbc59b6d98f09b26f39d6208faec76cc6aa3emarha2011-07-151-53/+6
| | | | | | | | | | But only for file winmultiwindowwndproc.c This caused regression in multiwindow mode when wgl was used.
* | Merge remote-tracking branch 'origin/released'marha2011-07-1415-2861/+2905
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c
| * mesa xserver git update 14 july 2011marha2011-07-1413-2603/+2678
| |
* | Updated version to 1.10.3.01.10.3.0marha2011-07-112-2/+2
| |
* | Added include path in dix to solve compile problemmarha2011-07-041-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0458-11418/+11680
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c
| * xserver mesa git update 4 July 2011marha2011-07-0458-11397/+11659
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0139-5493/+5528
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0140-5485/+5559
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-237-598/+617
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-237-598/+617
| |
* | Synchronised files with mesamarha2011-06-212-19/+28
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-204-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-204-6/+6
| |
* | Syncrhonised file with mesamarha2011-06-161-1084/+2644
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-1610-1783/+8439
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp
| * xserver xkeyboard-config xkbcomp git update 16 June 2011marha2011-06-1610-1783/+8439
| |
* | Solved compile errormarha2011-06-151-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-153-49/+92
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
| * mesa xserver git update 15 June 2011marha2011-06-153-48/+92
| |
* | Solved compile time warningmarha2011-06-141-1/+1
| |