Nicolas Pierron 6b1307c6f1 * Remove a stale lock file that may prevent the ... X server from starting. svn path=/nixos/branches/fix-style/; revision=14165		2009-02-22 16:07:16 +00:00
..
desktopManager	Remove name argument of merge functions.	2009-01-25 15:49:23 +00:00
displayManager	Use the mergeOneOption function instead of duplicated code.	2009-01-25 15:49:18 +00:00
windowManager	Remove name argument of merge functions.	2009-01-25 15:49:23 +00:00
default.nix	* Remove a stale lock file that may prevent the	2009-02-22 16:07:16 +00:00
xserver.conf	Split xserver upstart job into:	2009-01-25 15:49:08 +00:00