Revert "Remove master-merge script"

This reverts commit d3dc091. A version number change used to build the docs cross-pollinated into the deletion of the script.

Doxyfile

@@ -41,7 +41,7 @@ PROJECT_NAME           = Crypto++
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 5.6.5
+PROJECT_NUMBER         = 6.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

TestScripts/master-merge.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+if [[ (-z $(git rev-parse HEAD 2>/dev/null)) ]]; then
+	echo "$PWD is not a Git repository"
+	[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+current=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)
+git fetch --all &>/dev/null &>/dev/null
+if [[ "$?" -ne "0" ]]; then
+	echo "git fetch --all failed"
+	[[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1
+fi
+
+for branch in $(git branch -a | cut -b 2- | grep "remotes/origin" | cut -f 3 -d '/' | awk '{print $1}');
+do
+	# Skip anything that looks like Master
+	if [[ ((-z "$branch") || ("$branch" = "master") || ("$branch" = "HEAD")) ]]; then
+		continue;
+	fi
+
+	# Skip anything that looks like a release, like CRYPTOPP_5_6_3
+	if [[ (! -z $(echo -n "$branch" | grep "CRYPTOPP_")) ]]; then
+		continue;
+	fi
+
+	echo "**************** $branch *******************"
+
+	git checkout -f "$branch" &>/dev/null
+	if [[ "$?" -ne "0" ]]; then
+		echo "git checkout $branch failed"
+		continue;
+	fi
+
+	git rebase "origin/$branch"
+	if [[ "$?" -ne "0" ]]; then
+		echo "git rebase $branch failed"
+		continue;
+	fi
+
+	git merge master -S -m "Merge branch 'master' into dev-branch '$branch'" &>/dev/null
+	if [[ "$?" -ne "0" ]]; then
+		echo "git merge $branch failed"
+		continue;
+	fi
+
+	git push &>/dev/null
+	if [[ "$?" -ne "0" ]]; then
+		echo "git push $branch failed"
+		continue;
+	fi
+
+	echo "Completed merging for '$branch'"
+
+done
+
+if [[ ! -z  "$current" ]]; then
+	git checkout "$current" &>/dev/null
+fi
+
+echo "Back on branch $current"
+
+[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0

config.h

@@ -74,7 +74,7 @@
 //   the version of the library the headers came from. It is not
 //   necessarily the version of the library built as a shared object if
 //   versions are inadvertently mixed and matched.
-#define CRYPTOPP_VERSION 565
+#define CRYPTOPP_VERSION 600
 
 // Define this if you want to set a prefix for TestData/ and TestVectors/
 //   Be mindful of the trailing slash since its simple concatenation.

cryptlib.h

@@ -3,7 +3,7 @@
 //! \file cryptlib.h
 //! \brief Abstract base classes that provide a uniform interface to this library.
 
-/*!	\mainpage Crypto++ Library 5.6.5 API Reference
+/*!	\mainpage Crypto++ Library 6.0 API Reference
 <dl>
 <dt>Abstract Base Classes<dd>
 	cryptlib.h