From 710f98a9b572cd126cd3f662b29244bc0d6e6533 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Mon, 5 Dec 2011 22:16:38 -0500
Subject: [PATCH] minor addition of the CREDITS file for 'make dist'

---
 ChangeLog-v2.0rc5 | 12 ++++++++++++
 ShortLog-v2.0rc5  |  4 +++-
 diffstat-v2.0rc5  | 10 +++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog-v2.0rc5 b/ChangeLog-v2.0rc5
index bae5cfed..c8a651f9 100644
--- a/ChangeLog-v2.0rc5
+++ b/ChangeLog-v2.0rc5
@@ -1,3 +1,15 @@
+commit 9bcd7cb137103db89400f4f652ab834e05ea5eba
+Author: Michael Rash <mbr@cipherdyne.org>
+Date:   Mon Dec 5 22:16:03 2011 -0500
+
+    Added the CREDITS file for 'make dist'
+
+commit 3b2ec921be16db4bcccb4a0bfe13ebdb620a5b31
+Author: Michael Rash <mbr@cipherdyne.org>
+Date:   Mon Dec 5 22:11:58 2011 -0500
+
+    change log doc updates
+
 commit 474a18b57d054939e6f4063d5ef491b4cee4a240
 Author: Michael Rash <mbr@cipherdyne.org>
 Date:   Mon Dec 5 22:10:47 2011 -0500
diff --git a/ShortLog-v2.0rc5 b/ShortLog-v2.0rc5
index c08b6e91..47ced599 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 (88):
+Michael Rash (90):
       removed 2.0.0 branch specific ChangeLog, ShortLog and diffstat files
       Disabled read-only relocations and immediate binding compiler
          protections
@@ -115,4 +115,6 @@ Michael Rash (88):
       added CREDITS file, bumped software version, added ChangeLog files
       Added various files to Makefile.am so that 'make dist' continues to
          work
+      change log doc updates
+      Added the CREDITS file for 'make dist'
 
diff --git a/diffstat-v2.0rc5 b/diffstat-v2.0rc5
index f6253d0b..0c7c41b4 100644
--- a/diffstat-v2.0rc5
+++ b/diffstat-v2.0rc5
@@ -1,9 +1,9 @@
  CREDITS                                        |   17 +
  ChangeLog-v2.0.0                               | 3020 ------------------------
- ChangeLog-v2.0rc5                              |  767 ++++++
- Makefile.am                                    |   66 +
+ ChangeLog-v2.0rc5                              |  785 ++++++
+ Makefile.am                                    |   67 +
  ShortLog-v2.0.0                                |  654 -----
- ShortLog-v2.0rc5                               |  114 +
+ ShortLog-v2.0rc5                               |  118 +
  VERSION                                        |    2 +-
  android/project/jni/config.h                   |    6 +-
  client/Makefile.am                             |    2 +-
@@ -20,7 +20,7 @@
  common/netinet_common.h                        |   11 +-
  configure.ac                                   |   66 +-
  diffstat-v2.0.0                                | 1310 ----------
- diffstat-v2.0rc5                               |  196 ++
+ diffstat-v2.0rc5                               |  209 ++
  doc/fwknop.man.asciidoc                        |    8 +-
  doc/fwknopd.man.asciidoc                       |   93 +-
  doc/libfko.texi                                |   12 +-
@@ -139,7 +139,7 @@
  test/hardening-check                           |  285 +++
  test/test-fwknop.pl                            | 2689 +++++++++++++++++++++
  win32/config.h                                 |    2 +-
- 141 files changed, 13795 insertions(+), 6178 deletions(-)
+ 141 files changed, 13831 insertions(+), 6178 deletions(-)
  create mode 100644 CREDITS
  delete mode 100644 ChangeLog-v2.0.0
  create mode 100644 ChangeLog-v2.0rc5