aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-044-5/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-044-5/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-012-10/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-012-10/+19
| | | | | | | | 2011
* | 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
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-062-1019/+888
|\| | | | | | | | | | | | | | | 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-062-1019/+888
| |
* | 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
| |
* | merge ^/branches/released .marha2011-05-2313-559/+603
|\|
| * xserver git update 23 May 2011marha2011-05-2313-142/+186
| |
* | merge ^/branches/released .marha2011-05-1614-352/+916
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1614-103/+667
| |
* | 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-2832-4483/+4318
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-2832-3533/+3368
| |
* | svn merge ^/branches/released .marha2011-04-276-716/+786
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-276-727/+797
| |
* | svn merge ^/branches/released .marha2011-03-301-24/+0
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-301-24/+0
| |
* | svn merge ^/branches/released .marha2011-03-287-182/+61
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-287-1877/+1756
| |
* | svn merge ^/branches/released .marha2011-03-0410-2174/+2257
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-0410-1816/+1899
| |
* | svn merge ^/branches/released .marha2011-02-2510-7251/+7899
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-2510-3728/+4376
|/
* libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-0355-62038/+63573
|
* xserver pixman mesa git update 19 jan 2011marha2011-01-195-38/+6
|
* xserver libXdmcp git update 16-12-2010marha2010-12-1614-4263/+3996
|
* xserver pixman git update 7-12-2010marha2010-12-074-12/+52
|
* xserver libX11 libxcb update 1/12/2010marha2010-12-012-24/+0
|
* libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010marha2010-11-2624-302/+241
|
* xserver git update 15/11/2010marha2010-11-151-1/+3
|
* xserver pixman libX11 libXext 14/11/2010marha2010-11-143-89/+14
|
* xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-3018-1868/+2465
|
* xserver libX11 pixman git update 14/9/2010marha2010-09-143-15/+1
|
* xserver git update 13/9/2010marha2010-09-1359-70861/+65012
|
* xserver git update 11/9/2010marha2010-09-111-2/+1
|
* xserver git update 19/8/2010marha2010-08-195-1350/+1372
|
* xserver libX11 libXdmcp git update 2-8-2010marha2010-08-022-166/+167
|
* xserver libxcb git update 14/7/2010marha2010-07-145-149/+123
|
* xserver git update 14/6/2010marha2010-06-141-6/+6
|
* xserver git update 11/6/2010marha2010-06-1115-2919/+2936
|
* xserver git update 27/5/2010marha2010-05-271-1/+1
|
* xserver git update 26/5/2010marha2010-05-261-257/+257
|
* xserver git update 20/5/2010marha2010-05-202-15/+3
|
* xserver git update 18/10/2010marha2010-05-182-8/+25
|
* xserver git update 15/5/2010marha2010-05-1513-5887/+5886
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 14:02:44 +0000