]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Wed, 24 Jul 2013 05:58:34 +0000 (17:58 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Wed, 24 Jul 2013 05:58:34 +0000 (17:58 +1200)
1  2 
src/seat.c
tests/src/Makefile.am

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