Added a merge option to optionally reload files instead of merging them
authorMartin Willi <martin@revosec.ch>
Tue, 12 Apr 2011 09:13:08 +0000 (11:13 +0200)
committerMartin Willi <martin@revosec.ch>
Fri, 15 Apr 2011 08:07:13 +0000 (10:07 +0200)
commit32973044b0cf27d1eb764761459939424117b511
treed43cd338012464defc66cba046c4ed569236dc74
parented49e9a30313a3e9967dc0cbb5a1f05dcf5f930c
Added a merge option to optionally reload files instead of merging them
src/conftest/conftest.c
src/libstrongswan/settings.c
src/libstrongswan/settings.h