]> git.ipfire.org Git - people/ms/strongswan.git/commitdiff
projects / people / ms / strongswan.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb14ecb 83e2c81)
Merge branch 'stroke-timeout'
authorMartin Willi <martin@revosec.ch>
Mon, 18 Mar 2013 09:11:46 +0000 (10:11 +0100)
committerMartin Willi <martin@revosec.ch>
Mon, 18 Mar 2013 09:11:46 +0000 (10:11 +0100)
Add a strongswan.conf timeout option for stroke control commands.


Trivial merge
Michael's strongswan development tree