diff --git a/ChangeLog-v2.0rc5 b/ChangeLog-v2.0rc5 index c8a651f9..65f565b7 100644 --- a/ChangeLog-v2.0rc5 +++ b/ChangeLog-v2.0rc5 @@ -1,3 +1,21 @@ +commit 7a231a3b72758d93b4b9425fd403247aa2018499 +Author: Michael Rash +Date: Mon Dec 5 22:21:31 2011 -0500 + + added local_spa.key file + +commit 3d0ceccf65010a84dd30fc5e9c567e24f03104ce +Author: Michael Rash +Date: Mon Dec 5 22:20:39 2011 -0500 + + added local_spa.key file + +commit 710f98a9b572cd126cd3f662b29244bc0d6e6533 +Author: Michael Rash +Date: Mon Dec 5 22:16:38 2011 -0500 + + minor addition of the CREDITS file for 'make dist' + commit 9bcd7cb137103db89400f4f652ab834e05ea5eba Author: Michael Rash Date: Mon Dec 5 22:16:03 2011 -0500 diff --git a/ShortLog-v2.0rc5 b/ShortLog-v2.0rc5 index 47ced599..7ddbb07f 100644 --- a/ShortLog-v2.0rc5 +++ b/ShortLog-v2.0rc5 @@ -6,7 +6,7 @@ Damien Stuart (2): Max Kastanas (1): Codebase of Fwknop client for iOS (iPhone) devices -Michael Rash (90): +Michael Rash (93): removed 2.0.0 branch specific ChangeLog, ShortLog and diffstat files Disabled read-only relocations and immediate binding compiler protections @@ -117,4 +117,7 @@ Michael Rash (90): work change log doc updates Added the CREDITS file for 'make dist' + minor addition of the CREDITS file for 'make dist' + added local_spa.key file + added local_spa.key file diff --git a/diffstat-v2.0rc5 b/diffstat-v2.0rc5 index 0c7c41b4..c7b26bba 100644 --- a/diffstat-v2.0rc5 +++ b/diffstat-v2.0rc5 @@ -1,9 +1,9 @@ CREDITS | 17 + ChangeLog-v2.0.0 | 3020 ------------------------ - ChangeLog-v2.0rc5 | 785 ++++++ - Makefile.am | 67 + + ChangeLog-v2.0rc5 | 797 +++++++ + Makefile.am | 68 + ShortLog-v2.0.0 | 654 ----- - ShortLog-v2.0rc5 | 118 + + ShortLog-v2.0rc5 | 120 + VERSION | 2 +- android/project/jni/config.h | 6 +- client/Makefile.am | 2 +- @@ -137,9 +137,10 @@ test/conf/server-gpg/trustdb.gpg | Bin 0 -> 1360 bytes test/conf/subnet_source_match_access.conf | 3 + test/hardening-check | 285 +++ + test/local_spa.key | 3 + test/test-fwknop.pl | 2689 +++++++++++++++++++++ win32/config.h | 2 +- - 141 files changed, 13831 insertions(+), 6178 deletions(-) + 142 files changed, 13849 insertions(+), 6178 deletions(-) create mode 100644 CREDITS delete mode 100644 ChangeLog-v2.0.0 create mode 100644 ChangeLog-v2.0rc5 @@ -206,4 +207,5 @@ create mode 100644 test/conf/server-gpg/trustdb.gpg create mode 100644 test/conf/subnet_source_match_access.conf create mode 100755 test/hardening-check + create mode 100644 test/local_spa.key create mode 100755 test/test-fwknop.pl