]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Fri, 28 Jun 2013 08:22:31 +0000 (20:22 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Fri, 28 Jun 2013 08:22:31 +0000 (20:22 +1200)
1  2 
src/display.c

diff --cc src/display.c
Simple merge