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: 32b0bc7 f657269)

author	Jesús González <jgonzalez@gdr-sistemas.com>
	Fri, 13 Feb 2015 10:47:09 +0000 (11:47 +0100)
committer	Jesús González <jgonzalez@gdr-sistemas.com>
	Fri, 13 Feb 2015 10:47:09 +0000 (11:47 +0100)
commit	47339c8ed3df100cb084f8ae1d173725f20b1cec
tree	c054e9bb409215f1b2f7dfdbc8a3a8cceda74dec	tree \| snapshot
parent	32b0bc705e8ba35bff732a6a61a9f920d351e6d9	commit \| diff
parent	f6572691e0f39f8585b423942d30be42c224cd37	commit \| diff

Merged changes from parent branch.
Fixed "lock-seat-after-vt-switch" test to expect X server reuse by the new greeter instead of X server reinitiation.

src/seat.c	diff1 \|	diff2 \|	blob \| history
tests/Makefile.am	diff1 \|	diff2 \|	blob \| history
tests/scripts/lock-seat-after-vt-switch.conf	\|	diff2 \|	blob \| history