]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Merge with trunk
authorLaércio de Sousa <lbsousajr@gmail.com>
Thu, 28 Aug 2014 13:25:58 +0000 (10:25 -0300)
committerLaércio de Sousa <lbsousajr@gmail.com>
Thu, 28 Aug 2014 13:25:58 +0000 (10:25 -0300)
1  2 
src/lightdm.c

diff --cc src/lightdm.c
Simple merge