]> granicus.if.org Git - icinga2/commitdiff
projects / icinga2 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca22752 97829fb)
Merge branch 'master' into compatido
authorMichael Friedrich <michael.friedrich@gmail.com>
Sat, 22 Sep 2012 13:07:43 +0000 (15:07 +0200)
committerMichael Friedrich <michael.friedrich@gmail.com>
Sat, 22 Sep 2012 13:07:43 +0000 (15:07 +0200)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
icinga2.sln patch | diff1 | diff2 | blob | history

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