]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
projects / sojka / lightdm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f8e15d adab30d)
Merge with trunk
authorRobert Ancell <robert.ancell@canonical.com>
Thu, 11 Sep 2014 04:08:38 +0000 (16:08 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Thu, 11 Sep 2014 04:08:38 +0000 (16:08 +1200)
1  2 
tests/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc tests/Makefile.am
Simple merge