[asl] 22/177: Merge

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository asl.

commit 4ca5aee8c7bd7cbbbd82c99f26ab84217e3432f1
Merge: d76730d 5b92a47
Author: AvtechScientific <AvtechScientific at users.noreply.github.com>
Date:   Fri Jun 12 13:00:01 2015 +0300

    Merge

 CMakeLists.txt                  | 1 +
 DefineOptions.cmake             | 2 +-
 README.md                       | 2 +-
 doc/Developer-Guide/Doxyfile.in | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --cc CMakeLists.txt
index f830947,4644380..08bde8e
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -7,15 -7,9 +7,16 @@@ cmake_minimum_required(VERSION 3.0.2 FA
  # Set version number
  set(ASL_VERSION_MAJOR 0)
  set(ASL_VERSION_MINOR 1)
 -set(ASL_VERSION_PATCH 2)
 +set(ASL_VERSION_PATCH 3)
++
  set(ASL_VERSION ${ASL_VERSION_MAJOR}.${ASL_VERSION_MINOR}.${ASL_VERSION_PATCH})
  
 +if (CMAKE_VERSION VERSION_LESS 3.1.0)
 +	set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 +else()
 +	set(CMAKE_CXX_STANDARD 11)
 +endif()
 +
  # Add definitions
  include(DefineOptions.cmake)
  include(DefineFunctions.cmake)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/asl.git