Merge remote-tracking branch 'origin/Neulive2.0_developement' into Neulive2.0_developement

This commit is contained in:
yichin
2020-04-23 11:02:32 +08:00
@@ -5,12 +5,12 @@
#define VERSION_DATE_YEAR 20
#define VERSION_DATE_MONTH 4
#define VERSION_DATE_DAY 23
#define VERSION_DATE_HOUR 10
#define VERSION_DATE_MINUTE 31
#define VERSION_DATE_HOUR 11
#define VERSION_DATE_MINUTE 2
// this is NOT the version hash !!
// it's the last version hash
#define VERSION_HASH 580cde7cf6e066696b660eafaa070129691f3018
#define VERSION_HASH 2cf61acef2689ce051e1cf08c754916612f651ed
#define VERSION_GIT_BRANCH Neulive2.0_developement
#endif