iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-07 22:04:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2018-05-06 00:18:57 +01:00
parent 22ef6de8e4 59cf8aabda
commit 54db6217eb
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -15,8 +15,8 @@
#
cmake_minimum_required(VERSION 3.1)
project(ZNC VERSION 1.8.0)
set(ZNC_VERSION 1.8.x)
project(ZNC VERSION 1.7.0)
set(ZNC_VERSION 1.7.x)
set(append_git_version true)
set(alpha_version "") # e.g. "-rc1"
set(VERSION_EXTRA "" CACHE STRING
configure.ac
+2 -2
View File
@@ -7,8 +7,8 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u
dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62
AC_PREREQ([2.62])
dnl Keep the version number in sync with version.h!
AC_INIT([znc], [1.8.x])
LIBZNC_VERSION=1.8.x
AC_INIT([znc], [1.7.x])
LIBZNC_VERSION=1.7.x
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([src/znc.cpp])
AC_LANG([C++])
include/znc/version.h
+2 -2
View File
@@ -19,10 +19,10 @@ limitations under the License.
#ifndef BUILD_WITH_CMAKE
// The following defines are for #if comparison (preprocessor only likes ints)
#define VERSION_MAJOR 1
#define VERSION_MINOR 8
#define VERSION_MINOR 7
#define VERSION_PATCH -1
// This one is for display purpose and to check ABI compatibility of modules
#define VERSION_STR "1.8.x"
#define VERSION_STR "1.7.x"
#endif
// Don't use this one