]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merged changes from parent branch.
authorJesús González <jgonzalez@gdr-sistemas.com>
Tue, 28 Apr 2015 00:12:04 +0000 (02:12 +0200)
committerJesús González <jgonzalez@gdr-sistemas.com>
Tue, 28 Apr 2015 00:12:04 +0000 (02:12 +0200)
1  2 
src/seat.c
tests/Makefile.am
tests/scripts/lock-seat-after-vt-switch.conf

diff --cc src/seat.c
Simple merge
Simple merge