]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
projects / sojka / lightdm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a431dee 0fe3ae5)
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Tue, 23 Apr 2013 02:18:02 +0000 (14:18 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Tue, 23 Apr 2013 02:18:02 +0000 (14:18 +1200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/xserver-local.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/xserver-local.c
Simple merge