aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz/mach-startup
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-011-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+3
| | | | | | | | 2011
* | Merge remote-tracking branch 'origin/released'marha2011-06-061-1/+0
|\| | | | | | | | | | | | | | | 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-061-1/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+2
| |
* | merge ^/branches/released .marha2011-05-232-2/+4
|\|
| * xserver git update 23 May 2011marha2011-05-232-2/+4
| |
* | merge ^/branches/released .marha2011-05-164-127/+179
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-164-46/+98
| |
* | svn merge ^/branches/released .marha2011-04-283-459/+454
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-283-63/+58
| |
* | svn merge ^/branches/released .marha2011-04-271-20/+27
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-271-691/+698
|/
* xserver pixman git update 7-12-2010marha2010-12-071-1/+1
|
* xserver git update 11/9/2010marha2010-09-111-2/+1
|
* xserver git update 11/6/2010marha2010-06-111-692/+692
|
* xserver git update 18/10/2010marha2010-05-181-0/+5
|
* Removed files not in the git repositorymarha2010-04-281-868/+0
|
* git update 22/4/2010marha2010-04-221-1/+1
|
* Updated to following packages:marha2010-04-022-5/+8
| | | | | pixman-0.18.0 xorg-server-1.8.0
* Updated to xorg-server-1.7.99.902marha2010-03-222-2/+5
|
* Git update 24/2/2010"marha2010-02-242-14/+23
|
* Updated to xorg-server-1.7.99.901marha2010-02-141-1/+5
|
* Switched to xorg-server-1.7.99.2marha2009-12-201-1/+13
|
* Git update 14/12/2009marha2009-12-141-1/+2
|
* Git update 8/12/2009marha2009-12-081-4/+8
|
* Xserver git updatemarha2009-12-022-14/+23
|
* Updated to xorg-server-1.7.99.1marha2009-10-212-16/+5
|
* Updated to:marha2009-10-123-34/+48
| | | | | | | font-util-1.1.1 xorg-server-1.7.0.901
* Updated tomarha2009-10-043-28/+19
| | | | | | | | | | | | | | | xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0
* Checked in xorg-server-1.6.99.901marha2009-09-155-42/+100
|
* Switched to xorg-server-1.6.99.900.tar.gzmarha2009-09-064-20/+83
|
* Switched to xorg-server-1.6.3.901.tar.gzmarha2009-09-021-65/+122
|
* Added xorg-server-1.6.2.tar.gzmarha2009-07-258-0/+1931
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 05:59:56 +0000