Skip to content

Commit

Permalink
Release 1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Morwenn committed Jan 12, 2021
1 parent b367e98 commit 9197548
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.1 LANGUAGES CXX)
project(timsort VERSION 1.2.2 LANGUAGES CXX)

include(CMakePackageConfigHelpers)
include(GNUInstallDirs)
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Latest Release](https://img.shields.io/badge/release-1.2.1-blue.svg)](https://github.com/timsort/cpp-TimSort/releases/tag/v1.2.1)
[![Conan Package](https://img.shields.io/badge/conan-cpp--TimSort%2F1.2.1-blue.svg)](https://conan.io/center/timsort?version=1.2.1)
[![Latest Release](https://img.shields.io/badge/release-1.2.2-blue.svg)](https://github.com/timsort/cpp-TimSort/releases/tag/v1.2.2)
[![Conan Package](https://img.shields.io/badge/conan-cpp--TimSort%2F1.2.2-blue.svg)](https://conan.io/center/timsort?version=1.2.2)

## TimSort

Expand Down Expand Up @@ -73,7 +73,7 @@ Alternatively the library is also available on conan-center-index and can be ins
the following command:

```sh
conan install timsort/1.2.1
conan install timsort/1.2.2
```

## DIAGNOSTICS & INFORMATION
Expand Down
4 changes: 2 additions & 2 deletions include/gfx/timsort.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) <[email protected]>.
* Copyright (c) 2019-2020 Morwenn.
* Copyright (c) 2019-2021 Morwenn.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
Expand Down Expand Up @@ -39,7 +39,7 @@

#define GFX_TIMSORT_VERSION_MAJOR 1
#define GFX_TIMSORT_VERSION_MINOR 2
#define GFX_TIMSORT_VERSION_PATCH 1
#define GFX_TIMSORT_VERSION_PATCH 2

// Diagnostic selection macros

Expand Down

0 comments on commit 9197548

Please sign in to comment.