]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merged changes from parent branch
authorJesús González <jgonzalez@gdr-sistemas.com>
Fri, 21 Nov 2014 07:45:05 +0000 (08:45 +0100)
committerJesús González <jgonzalez@gdr-sistemas.com>
Fri, 21 Nov 2014 07:45:05 +0000 (08:45 +0100)
1  2 
src/seat.c
src/session.c

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