diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
| commit | 2951f3ad5d4937e76883502842ccc0074cc75862 (patch) | |
| tree | 937d15cc97468bcbacbccf1f953dbc07b8755238 /data | |
| parent | e02cee89092b183898e7d8e539a16e663b3921e3 (diff) | |
| parent | baf1027424c79b584a6305b7c143766141e6767d (diff) | |
| download | lightdm-2951f3ad5d4937e76883502842ccc0074cc75862.tar.gz | |
Merge with trunk
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/lightdm.conf | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index f7f73af9..b3dd2f80 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -32,6 +32,3 @@ dist_man1_MANS = dm-tool.1 \ EXTRA_DIST = apparmor/lightdm-guest-session.in CLEANFILES = lightdm-guest-session - -DISTCLEANFILES = \ - Makefile.in diff --git a/data/lightdm.conf b/data/lightdm.conf index d48c8d13..72a4a908 100644 --- a/data/lightdm.conf +++ b/data/lightdm.conf @@ -118,7 +118,7 @@ #autologin-user= #autologin-user-timeout=0 #autologin-in-background=false -#autologin-session=UNIMPLEMENTED +#autologin-session= #exit-on-failure=false # |