mirror of https://github.com/Icinga/icinga2.git
c63a9da326
Conflicts: components/compatido/compatidocomponent.cpp |
||
---|---|---|
.. | ||
Makefile.am | ||
compatido.vcxproj | ||
compatido.vcxproj.filters | ||
compatidocomponent.cpp | ||
compatidocomponent.h | ||
i2-compatido.h | ||
idosocket.cpp | ||
idosocket.h |