]> granicus.if.org Git - icinga2/commitdiff
projects / icinga2 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3142ed 2e8ed6a)
Merge branch 'master' of ssh://github.com/gunnarbeutner/i2test
authorGunnar Beutner <gunnar.beutner@netways.de>
Wed, 4 Apr 2012 08:05:49 +0000 (10:05 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Wed, 4 Apr 2012 08:05:49 +0000 (10:05 +0200)
1  2 
base/Makefile.am patch | diff1 | diff2 | blob | history

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