Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-07-10 22:22:14 +08:00
commit 3d5ac98e9d
47 changed files with 1435 additions and 608 deletions

View file

@ -17,10 +17,10 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define SOFTOKEN_VERSION "3.48.2" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VERSION "3.48.3" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 48
#define SOFTOKEN_VPATCH 2
#define SOFTOKEN_VPATCH 3
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_FALSE