rollup merge of #24670: brson/1.1
We're not going to do another merge into beta, so what's on master is now destined for 1.1. Also reset the prerelease number to ".1"
This commit is contained in:
commit
cfbc5bebae
|
@ -13,12 +13,12 @@
|
|||
######################################################################
|
||||
|
||||
# The version number
|
||||
CFG_RELEASE_NUM=1.0.0
|
||||
CFG_RELEASE_NUM=1.1.0
|
||||
|
||||
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
|
||||
# NB Make sure it starts with a dot to conform to semver pre-release
|
||||
# versions (section 9)
|
||||
CFG_PRERELEASE_VERSION=.3
|
||||
CFG_PRERELEASE_VERSION=.1
|
||||
|
||||
CFG_FILENAME_EXTRA=4e7c5e5c
|
||||
|
||||
|
|
Loading…
Reference in New Issue