]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Sat, 20 Jul 2013 20:53:05 +0000 (08:53 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Sat, 20 Jul 2013 20:53:05 +0000 (08:53 +1200)
1  2 
tests/src/X.c

diff --cc tests/src/X.c
Simple merge