projects / fwknop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc8a034 86fde0d)
Merge branch 'master' into crypto_update
authorMichael Rash <mbr@cipherdyne.org>
Tue, 10 Jul 2012 12:23:16 +0000 (08:23 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Tue, 10 Jul 2012 12:23:16 +0000 (08:23 -0400)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
test/test-fwknop.pl patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc test/test-fwknop.pl
Simple merge
fwknop: Single Packet Authorization and Port Knocking