]> granicus.if.org Git - icinga2/commitdiff
projects / icinga2 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9f8f6c bd37c35)
Merge branch 'master' into mfriedrich/compatido
authorMichael Friedrich <michael.friedrich@gmail.com>
Thu, 27 Sep 2012 13:10:04 +0000 (15:10 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Thu, 27 Sep 2012 13:10:04 +0000 (15:10 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

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