]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commit
Merge from trunk
authorMichael Terry <michael.terry@canonical.com>
Mon, 28 Oct 2013 18:31:41 +0000 (11:31 -0700)
committerMichael Terry <michael.terry@canonical.com>
Mon, 28 Oct 2013 18:31:41 +0000 (11:31 -0700)
commit152dc752b3d7b090b5b7cbf5f9ca326a20b1ae51
treebb480b6d061f6af0cabfc009260ba5a722a6683f
parente4c5d47687e729da29deb3a0a62c25268df21bd4
parent7d4038ebb7c9a8ad3a69bef43b511124224628ec
Merge from trunk
12 files changed:
src/session.c
src/session.h
tests/scripts/unity-compositor-command.conf
tests/scripts/unity-compositor-mir-next-session.conf
tests/scripts/unity-compositor-next-session.conf
tests/scripts/unity-login.conf
tests/scripts/unity-mir-greeter-mir-session.conf
tests/scripts/unity-mir-greeter-x-session.conf
tests/scripts/unity-mir-session-x-greeter.conf
tests/scripts/unity-switch.conf
tests/src/test-gobject-greeter.c
tests/src/test-session.c