aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkb
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-171-1/+1
|\ | | | | | | | | Conflicts: mesalib/src/mesa/swrast/s_readpix.c
| * xserver mesa git update 17 nov 2011marha2011-11-171-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-042-6/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-042-2/+9
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-2/+5
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-2/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-0/+1
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-271-6/+2
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-271-6/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-224-488/+373
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-224-488/+373
| |
* | Synchronised line endinge with release branchmarha2011-09-1214-18467/+18467
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-152-4/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c
| * xserver libX11 mesa git update 15 Julymarha2011-07-152-4/+46
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-081-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-081-3/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-061-15/+26
|\| | | | | | | | | | | | | | | 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-15/+26
| |
* | merge ^/branches/released .marha2011-05-163-55/+43
|\|
| * xserver xkeyboar-config mesa git update 16 May 2011marha2011-05-163-1487/+1475
| |
* | svn merge ^/branches/released .marha2011-04-281-1/+0
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-281-1102/+1101
| |
* | svn merge ^/branches/released .marha2011-04-054-2766/+2781
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-054-400/+417
| |
* | svn merge ^/branches/released .marha2011-03-173-24/+51
|\|
| * xserver libX11 mesa git updaet 17 Mar 2011marha2011-03-173-359/+386
| |
* | svn merge ^/branches/released .marha2011-03-151-9/+2
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-1441/+1434
| |
* | Wrong type castmarha2011-03-141-1/+1
| |
* | Synchronised again with released versionmarha2011-03-141-3/+3
| |
* | svn merge ^/branches/released .marha2011-03-049-85/+65
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-049-13905/+13885
| |
* | svn merge ^/branches/released .marha2011-02-202-7205/+7249
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-202-7199/+7243
| |
* | svn merge ^/branches/released .marha2011-02-031-6737/+6742
|\|
| * libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 marha2011-02-031-6735/+6740
| |
* | Solved problem of wrong type for extern variablemarha2011-01-311-1/+1
| |
* | svn merge ^/branches/released .marha2011-01-212-2961/+2965
|\|
| * xserver mesa xkbcomp libxcb git update 21 jan 2011marha2011-01-212-2961/+2965
| |
* | svn merge ^/branches/released .marha2011-01-191-467/+463
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-191-463/+459
| |
* | svn merge ^/branches/released .marha2010-12-122-24/+38
|\|
| * xserver git update 10/12/2010marha2010-12-102-24/+38
| |
* | svn merge "^/branches/released" .marha2010-11-155-59/+36
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-145-59/+36
| |
* | svn merge ^/branches/released .marha2010-10-201-16/+21
|\|
| * xserver git update 20/10/2010marha2010-10-201-16/+21
| |
* | svn merge ^/branches/released .marha2010-09-116-22/+25
|\|
| * xserver git update 11/9/2010marha2010-09-116-22/+25
| |