aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
Commit message (Collapse)AuthorAgeFilesLines
* __func__ is not defined in VCmarha2011-06-081-1/+1
| | | | Replace it by the __FUNCTION__ macro
* Merge remote-tracking branch 'origin/released'marha2011-06-085-22/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/AppC.xml libX11/specs/libX11/AppD.xml libX11/specs/libX11/CH02.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/CH13.xml libX11/specs/libX11/CH14.xml libX11/specs/libX11/CH15.xml libX11/specs/libX11/CH16.xml mesalib/src/mesa/main/fbobject.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/test/input.c xorg-server/xkb/xkbfmisc.c
| * xserver libX11 mesa git update 8 Jun 2011marha2011-06-085-23/+40
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-071-1506/+1506
|\| | | | | | | | | Conflicts: xorg-server/randr/rrcrtc.c
| * git update xserver mesa 7 Jun 2011marha2011-06-071-1506/+1506
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-065-1035/+917
|\| | | | | | | | | | | | | | | 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-065-1035/+917
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-053-22/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de
| * libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011marha2011-06-053-22/+5
| |
* | Synchronised files with mesamarha2011-06-033-1743/+1760
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0331-2518/+3370
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0331-2516/+3368
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-0118-20375/+28803
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/xkeyboard-config/NEWS xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/po/ca.po xorg-server/xkeyboard-config/po/da.po xorg-server/xkeyboard-config/po/de.po xorg-server/xkeyboard-config/po/fr.po xorg-server/xkeyboard-config/po/it.po xorg-server/xkeyboard-config/po/ko.po xorg-server/xkeyboard-config/po/nl.po xorg-server/xkeyboard-config/po/pl.po xorg-server/xkeyboard-config/po/ru.po xorg-server/xkeyboard-config/po/sv.po xorg-server/xkeyboard-config/po/uk.po
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-0117-20375/+24995
| |
| * mesa pixman xkeyboard-config git update 1 Jun 2011marha2011-06-011-0/+3808
| |
* | Added gitignore filesmarha2011-05-302-0/+26
| |
* | Solved merge problemmarha2011-05-301-5/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2011-05-2921-1451/+1527
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2921-2609/+2680
| |
* | merge ^/branches/released .marha2011-05-252-3/+6
|\|
| * xkeyboard-config libX11 pixman mesa git update 25 May 2011marha2011-05-252-2280/+2283
| |
* | 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-242-2/+2
| |
* | merge ^/branches/released .marha2011-05-242-1/+6
|\|
| * xserver mesa git update 24 May 2011marha2011-05-241-1/+1
| |
* | merge ^/branches/released .marha2011-05-2315-576/+627
|\|
| * xserver git update 23 May 2011marha2011-05-2315-159/+210
| |
* | Reverted last change to solve xmodmap problemmarha2011-05-231-3/+3
| |
* | Removed change compared to released version. Was causing problem with alt gr ↵marha2011-05-231-1/+1
| | | | | | | | key in belgian keyboard
* | svn merge ^/branches/released .marha2011-05-224-3672/+11096
|\|
| * xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵marha2011-05-223-888/+885
| | | | | | | | May 2011
* | merge ^/branches/released .marha2011-05-187-1018/+1114
|\|
| * xkeyboard-config libX11 pixman mesa git update 18 May 2011marha2011-05-187-1439/+1535
| |
* | merge ^/branches/released .marha2011-05-1696-12918/+15743
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-1696-23781/+26603
| |
* | Chanded order of compilationmarha2011-05-101-1/+1
| |
* | Bumped version to 1.10.11.10.1marha2011-05-052-2/+2
|\| | | | | | | | | | | Added release note svn merge ^/branches/released .
* | Solved crash because of pointer usages after the memory has been freed.marha2011-05-051-4/+19
| |
* | Solved run-time exception in debug because value was larget then a s8marha2011-05-051-1/+1
| |
* | svn merge ^/branches/released .marha2011-05-035-644/+1615
|\|
| * xkeyboard libxcb pixman mesa git update 2 May 2011marha2011-05-034-2/+965
| |
* | svn merge ^/branches/released .marha2011-04-307-270/+265
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-307-2936/+2931
| |
* | Synchronised filesmarha2011-04-291-3/+2
| |
* | svn merge ^/branches/released .marha2011-04-292-21/+8
|\|
| * xserver mesa git update 28 Apr 2011marha2011-04-292-21/+8
| |
* | svn merge ^/branches/released .marha2011-04-2883-11757/+11483
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-2885-26501/+26266
| |
* | svn merge ^/branches/released .marha2011-04-2765-6615/+7139
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 22:10:21 +0000