Merge branch 'master' into develop
This commit is contained in:
commit
1b51c5d7c4
3 changed files with 3 additions and 3 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Clixon Changelog
|
||||
|
||||
## 3.5.0 (Upcoming)
|
||||
## 3.5.0 (12 February 2018)
|
||||
|
||||
### Major changes:
|
||||
* Major Restconf feature update to compy to RFC 8040. Thanks Stephen Jones for getting right.
|
||||
|
|
|
|||
2
configure
vendored
2
configure
vendored
|
|
@ -2152,7 +2152,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
CLIXON_VERSION_MAJOR="3"
|
||||
CLIXON_VERSION_MINOR="5"
|
||||
CLIXON_VERSION_PATCH="0"
|
||||
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
|
||||
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
|
||||
# Fix to specific version (eg 3.5) or head (3)
|
||||
CLIGEN_VERSION="3"
|
||||
if test "$prefix" = "NONE"; then
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ AC_INIT(lib/clixon/clixon.h.in)
|
|||
CLIXON_VERSION_MAJOR="3"
|
||||
CLIXON_VERSION_MINOR="5"
|
||||
CLIXON_VERSION_PATCH="0"
|
||||
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
|
||||
CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
|
||||
# Fix to specific version (eg 3.5) or head (3)
|
||||
CLIGEN_VERSION="3"
|
||||
if test "$prefix" = "NONE"; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue