aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/main.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2014-11-291-4/+4
|\
| * fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-conf...marha2014-11-291-4/+4
* | Merge remote-tracking branch 'origin/released'marha2014-10-011-0/+2
|\|
| * libxtrans xkeyboard-config xserver mesa plink glproto git update 21 Sep 2014marha2014-09-211-0/+2
* | Merge remote-tracking branch 'origin/released'marha2014-03-091-1/+3
|\|
| * fontconfig mesa xserver git update 9 Mar 2014marha2014-03-091-1/+3
* | Merge remote-tracking branch 'origin/released'marha2014-01-151-1/+1
|\|
| * mesa xkeyboard-config xserver git update 15 jan 2014marha2014-01-151-1/+1
* | Merge remote-tracking branch 'origin/released'marha2013-07-251-5/+1
|\|
| * xserver mesa git update 25 Jul 2013marha2013-07-251-5/+1
| * xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb li...marha2013-06-041-0/+7
| * fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-04-111-0/+2
* | xwininfo fontconfig libX11 libXau libXdmcp libXext mesa libXinerama libxcb li...marha2013-06-041-0/+7
* | Merge remote-tracking branch 'origin/released'marha2013-03-251-0/+2
|\ \
| * | fontconfig mesa pixman xserver git update 25 Mar 2013marha2013-03-251-0/+2
| |/
* | Initialize the log file a little bit earlier in the startup processmarha2012-09-051-0/+1
* | Merge remote-tracking branch 'origin/released'marha2012-08-161-9/+9
|\|
| * libxcb xserver mesa git update 16 Aug 2012marha2012-08-161-9/+9
* | Merge remote-tracking branch 'origin/released'marha2012-07-091-0/+15
|\|
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-091-0/+15
* | Merge remote-tracking branch 'origin/released'marha2012-07-061-0/+1
|\|
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-061-0/+1
* | Solved problem of using wrong name for log file when -displayfd is usedmarha2012-06-291-1/+1
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-0/+4
|\|
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-151-0/+4
* | Merge remote-tracking branch 'origin/released'marha2012-06-081-3/+3
|\|
| * Used synchronise script to update filesmarha2012-06-081-3/+3
* | Merge remote-tracking branch 'origin/released'marha2012-03-261-181/+179
|\|
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-231-181/+179
* | Synchronised line endinge with release branchmarha2011-09-121-408/+408
* | Merge remote-tracking branch 'origin/released'marha2011-08-011-1/+1
|\|
| * mesa xserver pixman xkeyboard-config git update 1 aug 2011marha2011-08-011-1/+1
* | Merge remote-tracking branch 'origin/released'marha2011-06-031-2/+0
|\|
| * xserver xkeyboard-config mesa git update 3 Jun 2011marha2011-06-031-2/+0
* | merge ^/branches/released .marha2011-05-231-9/+16
|\|
| * xserver git update 23 May 2011marha2011-05-231-9/+16
* | Delay calling winInitializeModeKeyStates until the keyboard device has been s...marha2011-03-161-0/+5
* | svn merge ^/branches/released .marha2011-03-041-0/+3
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-041-351/+354
* | svn merge ^/branches/released .marha2010-09-301-4/+0
|\|
| * xserver libX11 xkeyboard-config git update 30/9/2010marha2010-09-301-4/+0
* | svn merge ^/branches/released .marha2010-07-011-1/+2
|\|
| * git update 1/7/2010marha2010-07-011-1/+3
* | Solved initialisation problem with privatesmarha2010-06-151-2/+3
* | svn merge ^/branches/released .marha2010-06-111-10/+18
|\|
| * xserver git update 11/6/2010marha2010-06-111-10/+18
| * xserver git update 15/5/2010marha2010-05-151-345/+345
| * xserver git update 4/5/2010marha2010-05-041-1/+0
| * git update 27/4/2010marha2010-04-271-3/+1
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-3/+3