]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commit
Merge from trunk
authorMichael Terry <michael.terry@canonical.com>
Thu, 17 Oct 2013 21:04:53 +0000 (17:04 -0400)
committerMichael Terry <michael.terry@canonical.com>
Thu, 17 Oct 2013 21:04:53 +0000 (17:04 -0400)
commit5261895810361e6e78494d2c8fdaff75b08af1ec
tree57ff9dcce276a4d655bf5de72c4233a8f7cbc10d
parentf0f9328a9c4e9e38a651f9eac58a6f2373cf0de0
parent056b19bc07a2e2e703f32d58fd0e0c520d27613f
Merge from trunk
src/mir-server.c
src/seat-unity.c
src/seat-xlocal.c
src/seat-xremote.c
src/seat.c
src/seat.h