Commit 3fbb877e authored by Sandrine Avakian's avatar Sandrine Avakian

Merge branch '1.1.x' into release-1.1.x

parents f5f2d310 499974bf
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
############################################################################ ############################################################################
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(mssilk VERSION 1.0.2 LANGUAGES C) project(mssilk VERSION 1.1.0 LANGUAGES C)
option(ENABLE_SHARED "Build shared library." YES) option(ENABLE_SHARED "Build shared library." YES)
......
mssilk 1.0.3 -- June xx, 2016 mssilk 1.1.0 -- August 8th, 2016
* MSFactory usage. * MSFactory usage.
\ No newline at end of file
# -*- Autoconf -*- # -*- Autoconf -*-
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_INIT([mssilk],[1.0.2]) AC_INIT([mssilk],[1.1.0])
AC_PREREQ(2.63) AC_PREREQ(2.63)
AC_CONFIG_SRCDIR([sdk/known_checksums/SILK_SDK_SRC_v1.0.8.zip.md5]) AC_CONFIG_SRCDIR([sdk/known_checksums/SILK_SDK_SRC_v1.0.8.zip.md5])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment