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

This commit is contained in:
roytam1 2020-12-02 09:58:28 +08:00
commit ee11f1749b
13 changed files with 161 additions and 121 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.4" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VERSION "3.48.5" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 48
#define SOFTOKEN_VPATCH 4
#define SOFTOKEN_VPATCH 5
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_FALSE