rtime.felk.cvut.cz Git - sojka/lightdm.git/commit

]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commit

projects / sojka / lightdm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9cda4ea 8b92896)

author	Robert Ancell <robert.ancell@canonical.com>
	Sat, 20 Jul 2013 23:39:11 +0000 (11:39 +1200)
committer	Robert Ancell <robert.ancell@canonical.com>
	Sat, 20 Jul 2013 23:39:11 +0000 (11:39 +1200)
commit	14864bb9cdc978dadea146114bed9dc68443847b
tree	52aebe3a9a50937257843bbc998d6e65ec26357d	tree \| snapshot
parent	9cda4eae4a627c0727895d042048ee612b9a2851	commit \| diff
parent	8b928966d66ec4e93862d4cb1c45a7f319300370	commit \| diff

Merge with trunk

19 files changed:

src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/display-manager.c	diff1 \|	diff2 \|	blob \| history
src/display-server.c	diff1 \|	diff2 \|	blob \| history
src/greeter.c	diff1 \|	diff2 \|	blob \| history
src/seat-unity.c	diff1 \|	diff2 \|	blob \| history
src/seat.c	diff1 \|	diff2 \|	blob \| history
src/session.c	diff1 \|	diff2 \|	blob \| history
tests/scripts/autologin-guest-fail-setup-script.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/autologin-invalid-user.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/autologin-new-authtok.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/autologin-password.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/crash-authenticate.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/denied.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/expired.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/login-guest-fail-setup-script.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/login-invalid-session.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/script-hook-fail-session-setup.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/unity-switch.conf	diff1 \|	diff2 \|	blob \| history
tests/scripts/user-renamed-invalid.conf	diff1 \|	diff2 \|	blob \| history