]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Sun, 30 Jun 2013 07:53:18 +0000 (19:53 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Sun, 30 Jun 2013 07:53:18 +0000 (19:53 +1200)
1  2 
src/display.c
src/display.h
src/seat.c

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