]> granicus.if.org Git - icinga2/commit
Fixed merge conflicts.
authorGunnar Beutner <gunnar@beutner.name>
Mon, 4 Jun 2012 07:21:33 +0000 (09:21 +0200)
committerGunnar Beutner <gunnar@beutner.name>
Mon, 4 Jun 2012 07:21:33 +0000 (09:21 +0200)
commit9c3e57c858b269b34dda6c417a6822846197c250
tree4ec94b7d22d0f1156dea2aa8449277aeb6f2b34d
parent99e5eef7c1afe34d7cc4037510832cfd6bf97c6a
Fixed merge conflicts.
components/configfile/configfile.vcxproj
dyn/configcontext.h
dyn/configobject.h [new file with mode: 0644]
dyn/dyn.vcxproj