From f19d4d6c4715efb10e414125e4fe3c0b596f63e8 Mon Sep 17 00:00:00 2001 From: Morwenn Date: Sat, 17 Oct 2020 14:25:01 +0200 Subject: [PATCH] 1.2.1 --- CMakeLists.txt | 2 +- README.md | 4 ++-- include/gfx/timsort.hpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74b82d7..37e3704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8.0) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -project(timsort VERSION 1.0.0 LANGUAGES CXX) +project(timsort VERSION 1.2.1 LANGUAGES CXX) include(CMakePackageConfigHelpers) include(GNUInstallDirs) diff --git a/README.md b/README.md index 4f44e9d..afb1341 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Latest Release](https://img.shields.io/badge/release-cpp--TimSort%2F1.2.0-blue.svg)](https://github.com/timsort/cpp-TimSort/releases) -[![Conan Package](https://img.shields.io/badge/conan-1.2.0-blue.svg)](https://conan.io/center/timsort?version=1.2.0) +[![Latest Release](https://img.shields.io/badge/release-cpp--TimSort%2F1.2.1-blue.svg)](https://github.com/timsort/cpp-TimSort/releases/tag/v1.2.1) +[![Conan Package](https://img.shields.io/badge/conan-1.2.1-blue.svg)](https://conan.io/center/timsort?version=1.2.1) [![Build Status](https://travis-ci.org/timsort/cpp-TimSort.svg?branch=master)](https://travis-ci.org/timsort/cpp-TimSort) [![License](https://img.shields.io/:license-mit-blue.svg)](https://doge.mit-license.org) diff --git a/include/gfx/timsort.hpp b/include/gfx/timsort.hpp index e4014c5..dec9d3b 100644 --- a/include/gfx/timsort.hpp +++ b/include/gfx/timsort.hpp @@ -6,7 +6,7 @@ * - http://cr.openjdk.java.net/~martin/webrevs/openjdk7/timsort/raw_files/new/src/share/classes/java/util/TimSort.java * * Copyright (c) 2011 Fuji, Goro (gfx) . - * Copyright (c) 2019 Morwenn. + * Copyright (c) 2019-2020 Morwenn. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -39,7 +39,7 @@ #define GFX_TIMSORT_VERSION_MAJOR 1 #define GFX_TIMSORT_VERSION_MINOR 2 -#define GFX_TIMSORT_VERSION_PATCH 0 +#define GFX_TIMSORT_VERSION_PATCH 1 // Diagnostic selection macros