From: Zhang Xianyi <traits.zhang@gmail.com>
Date: Mon, 21 Mar 2016 00:48:21 +0000 (-0400)
Subject: Merge branch 'master' into develop
X-Git-Tag: v0.2.18^2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b987badb069a95256f2627144645ce5c1f5a7d0;p=platform%2Fupstream%2Fopenblas.git

Merge branch 'master' into develop
Bump to 0.2.18.dev

Conflicts:
	CMakeLists.txt
	Makefile.rule
---

9b987badb069a95256f2627144645ce5c1f5a7d0
diff --cc CMakeLists.txt
index ae7b973,78d5e0e..ff765cc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -6,7 -6,7 +6,7 @@@ cmake_minimum_required(VERSION 2.8.4
  project(OpenBLAS)
  set(OpenBLAS_MAJOR_VERSION 0)
  set(OpenBLAS_MINOR_VERSION 2)
- set(OpenBLAS_PATCH_VERSION 17.dev)
 -set(OpenBLAS_PATCH_VERSION 17)
++set(OpenBLAS_PATCH_VERSION 18.dev)
  set(OpenBLAS_VERSION "${OpenBLAS_MAJOR_VERSION}.${OpenBLAS_MINOR_VERSION}.${OpenBLAS_PATCH_VERSION}")
  
  enable_language(ASM)
diff --cc Makefile.rule
index 61b3dcd,0758a48..847ee1c
--- a/Makefile.rule
+++ b/Makefile.rule
@@@ -3,7 -3,7 +3,7 @@@
  #
  
  # This library's version
- VERSION = 0.2.17.dev
 -VERSION = 0.2.17
++VERSION = 0.2.18.dev
  
  # If you set the suffix, the library name will be libopenblas_$(LIBNAMESUFFIX).a
  # and libopenblas_$(LIBNAMESUFFIX).so. Meanwhile, the soname in shared library