aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/xiproperty.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-01-151-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: mesa xkeyboard-config xserver git update 15 jan 2014 randrproto libfontenc mesa xserver git update 10 Jan 2014 randsrproto fontconfig libX11 git update 6 Jan 2014 Conflicts: mesalib/src/glsl/builtin_functions.cpp mesalib/src/glsl/ir_builder.h xorg-server/Xext/xres.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/winwindowswm.c xorg-server/include/gc.h xorg-server/os/access.c
| * mesa xkeyboard-config xserver git update 15 jan 2014marha2014-01-151-4/+4
| | | | | | | | | | | | xserver commit 2d2d49dab5c5718989de97d7227aac793479745e xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad mesa commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43
* | Merge remote-tracking branch 'origin/released'marha2012-11-071-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
| * xserver mesa xkbcomp git update 5 nov 2012marha2012-11-051-0/+3
| | | | | | | | | | | | xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64
* | Merge remote-tracking branch 'origin/released'marha2012-08-071-126/+127
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwindow.h
| * mesa xserver xkeyboard-config git update 7 Aug 2012marha2012-08-071-126/+127
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-111-23/+24
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-101-52/+57
|/
* fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-211-1/+1
|
* libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231-428/+391
| | | | 23 Mar 2012
* mesa pixman xserver git update 11 jan 2012marha2012-01-111-1/+1
|
* mesa xserver pixman git update 25 nov 2011marha2011-11-251-2/+2
|
* mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-051-0/+5
| | | | update 5 oct 2011
* libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-221-1362/+1348
|
* xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-151-2/+2
|
* xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-201-1/+1
|
* xserver git update 11/6/2010marha2010-06-111-20/+19
|
* xserver git update 15/5/2010marha2010-05-151-14/+14
|
* xserver git update 9/5/2010marha2010-05-091-1354/+1363
|
* Git update 11/2/2010marha2010-02-111-0/+11
|
* Git update 14/12/2009marha2009-12-141-0/+2
|
* Xserver git updatemarha2009-12-021-0/+5
|
* Switched to xorg-server-1.6.99.900.tar.gzmarha2009-09-061-209/+627
|
* Added xorg-server-1.6.2.tar.gzmarha2009-07-251-0/+918