chiark / gitweb /
~ianmdlvl / elogind.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5a613c 79b1e6c)
Merge remote-tracking branch 'zbigniew/systemadm_changes'
authorLennart Poettering <lennart@poettering.net>
Wed, 2 Nov 2011 13:08:49 +0000 (14:08 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 2 Nov 2011 13:08:49 +0000 (14:08 +0100)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
configure.ac patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
Unnamed repository; edit this file 'description' to name the repository.