icinga2/components
Michael Friedrich c63a9da326 Merge branch 'master' of git.icinga.org:icinga2
Conflicts:
	components/compatido/compatidocomponent.cpp
2012-10-08 10:33:25 +02:00
..
checker Renamed NagiosCheckTask to PluginCheckTask. 2012-09-25 09:08:50 +02:00
compat Configuration: use underscore in attributes, document all using new locations 2012-10-02 14:44:57 +02:00
compatido Merge branch 'master' of git.icinga.org:icinga2 2012-10-08 10:33:25 +02:00
delegation Build fix for Windows. 2012-09-21 16:28:14 +02:00
demo Build fix for Windows. 2012-09-21 16:28:14 +02:00
replication Build fix for Windows. 2012-09-21 16:28:14 +02:00
Makefile.am Merge branch 'master' into mfriedrich/compatido 2012-09-24 17:48:46 +02:00