aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised line endinge with release branchmarha2011-09-1219-6220/+6220
|
* Merge remote-tracking branch 'origin/released'marha2011-08-041-221/+222
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-221/+222
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-011-3/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-011-3/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-043-4/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-043-4/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-151-0/+5
|\| | | | | | | | | | | | | | | | | | | | | 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-151-0/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-032-299/+299
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-299/+299
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-293-199/+199
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-293-199/+199
| |
* | merge ^/branches/released .marha2011-05-166-269/+303
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-166-369/+403
| |
* | svn merge ^/branches/released .marha2011-04-283-10/+12
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-283-545/+547
| |
* | svn merge ^/branches/released .marha2011-04-274-8/+10
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-274-151/+153
| |
* | svn merge ^/branches/released .marha2011-03-284-293/+279
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-284-616/+602
| |
* | svn merge ^/branches/released .marha2011-03-202-1/+2
|\|
| * xserver libX11 libxcb pixman mesa git update 20 Mar 2011marha2011-03-202-658/+659
| |
* | svn merge ^/branches/released .marha2011-03-171-0/+5
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-171-0/+5
| |
* | Synchronised with X11\extensions\XGBstr.h (so the debugger is not confused)marha2011-03-161-1/+1
| |
* | svn merge ^/branches/released .marha2011-03-155-87/+103
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-155-1346/+1362
| |
* | svn merge ^/branches/released .marha2011-03-105-147/+84
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-105-609/+546
| |
* | Enable only functions defined in windows XPmarha2011-03-091-1/+1
| | | | | | | | | | Enabled IPV6 compilation
* | svn merge ^/branches/released .marha2011-03-0413-2013/+2243
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-0413-2189/+2419
| |
* | svn merge ^/branches/released .marha2011-02-254-770/+771
|\|
| * xserver randrproto mesa xkeyboard-config git update 25 Feb 2011marha2011-02-254-284/+285
| |
* | svn merge ^/branches/released .marha2011-02-201-1/+1
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1/+1
| |
* | svn merge ^/branches/released .marha2011-02-031-246/+246
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-246/+246
| |
* | svn merge ^/branches/released .marha2011-01-213-1802/+1813
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-213-1802/+1813
| |
* | svn merge ^/branches/released .marha2011-01-191-573/+577
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-191-569/+573
| |
* | Prevent crash with remote font serversmarha2011-01-161-0/+5
| |
* | svn merge ^/branches/released .marha2011-01-086-11/+27
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-086-11/+27
| |
* | svn merge ^/branches/released .marha2010-12-124-4/+82
|\|
| * xserver git update 10/12/2010marha2010-12-104-4/+82
| |
* | svn merge ^/branches/released .marha2010-12-083-2/+7
|\|
| * xserver pixman git update 7-12-2010marha2010-12-073-2/+7
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 06:37:30 +0000