aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-1414-2695/+2740
|\ | | | | | | | | | | | | | | | | | | | | 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-1412-2437/+2513
| |
* | Updated version to 1.10.3.01.10.3.0marha2011-07-111-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0438-6572/+6604
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0438-6551/+6583
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-0115-2703/+2746
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0116-2704/+2779
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-233-14/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-233-14/+20
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-162-906/+20
|\| | | | | | | | | | | | | | | 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-162-906/+20
| |
* | Also show the cursor in the main window when the xdmcp host selection dialog ↵marha2011-06-091-9/+6
| | | | | | | | | | | | | | is shown. The cursor was not shown when the mouse was in the main window. Due to this it was hard to move the mouse into the host selection dialog box.
* | Updated credentialsmarha2011-06-081-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-063-1019/+890
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c
| * mesa xserver xkb git update 6 Jun 2011marha2011-06-063-1019/+890
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0312-446/+498
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile 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/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-0312-446/+498
| |
* | Solved merge problemmarha2011-05-301-5/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-2910-1220/+1303
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2910-2378/+2456
| |
* | Solved possible crash because windows window disappears in the middle of a ↵1.10.1.1marha2011-05-241-0/+5
| | | | | | | | function call
* | Format of dispatch.h has been changedmarha2011-05-241-1/+1
| |
* | Bumped version to 1.10.1.1marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-241-1/+1
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-2313-559/+603
|\|
| * xserver git update 23 May 2011marha2011-05-2313-142/+186
| |
* | svn merge ^/branches/released .marha2011-05-221-556/+554
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-221-556/+554
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-1642-11717/+12387
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1642-12604/+13274
| |
* | Bumped version to 1.10.11.10.1marha2011-05-051-1/+1
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
* | Solved crash because of pointer usages after the memory has been freed.marha2011-05-051-4/+19
| |
* | svn merge ^/branches/released .marha2011-04-304-262/+242
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-304-290/+270
| |
* | svn merge ^/branches/released .marha2011-04-291-12/+6
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-291-12/+6
| |
* | svn merge ^/branches/released .marha2011-04-2853-11444/+11279
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-2855-15191/+15065
| |
* | svn merge ^/branches/released .marha2011-04-2714-1532/+1601
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-2714-3398/+3467
| |
* | svn merge ^/branches/released .marha2011-04-151-9/+13
|\|
| * xserver xkeyboard-config libX11 mesa git update 15 April 2011marha2011-04-151-9/+13
| |
* | svn merge ^/branches/released .marha2011-04-142-21/+20
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-142-2203/+2202
| |
* | svn merge ^/branches/released .marha2011-04-061-1/+1
|\|
| * xserver libX11 libxcb mesa git update 6 Apr 2011marha2011-04-061-1/+1
| |
* | Solved crash due to null pointer accessmarha2011-04-051-0/+7
| |
* | svn merge ^/branches/released .marha2011-04-055-12/+40
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-055-3988/+4016
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:26:15 +0000