diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2013-07-01 12:22:11 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2013-07-01 12:22:11 +1200 |
| commit | 35ce9078a8254b1dac5f30b5dfb7b3d01aad6c78 (patch) | |
| tree | 3896c8b9d7197c4923c6a9114e7fba455d851fa7 /data | |
| parent | 94aaf2b7b139402fd1e7b4835b805dfc2cae908d (diff) | |
| parent | 0287202bc074346f5a0000bdd3b339451acb7ef0 (diff) | |
| download | lightdm-git-35ce9078a8254b1dac5f30b5dfb7b3d01aad6c78.tar.gz | |
Strip out non-core changes in preperation for merging into trunk
Diffstat (limited to 'data')
| -rw-r--r-- | data/lightdm.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/data/lightdm.conf b/data/lightdm.conf index d25fa189..3934f8cf 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -43,6 +43,8 @@ # xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) # xdmcp-port = XDMCP UDP/IP port to communicate on # xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) +# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option) +# unity-compositor-timeout = Number of seconds to wait for compositor to start # greeter-session = Session to load for greeter # greeter-hide-users = True to hide the user list # greeter-allow-guest = True if the greeter should show a guest login option @@ -73,6 +75,8 @@ #xdmcp-manager= #xdmcp-port=177 #xdmcp-key= +#unity-compositor-command=unity-system-compositor +#unity-compositor-timeout=60 #greeter-session=example-gtk-gnome #greeter-hide-users=false #greeter-allow-guest=true |