Skip to content

Commit

Permalink
Merge pull request #26 from MaxFleur/dev_staging
Browse files Browse the repository at this point in the history
Adjust version info to 2.2.0
  • Loading branch information
MaxFleur authored Sep 7, 2024
2 parents 0e7c2e4 + 287902e commit feba060
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![License badge](https://img.shields.io/badge/License-MIT-blue.svg)
![C++ badge](https://img.shields.io/badge/C++-17-blue.svg)
![CI badge](https://github.com/MaxFleur/LightCombatManager/actions/workflows/run.yml/badge.svg)
![Tag badge](https://img.shields.io/badge/Release-v2.1.0-blue.svg)
![Tag badge](https://img.shields.io/badge/Release-v2.2.0-blue.svg)

</div>

Expand Down Expand Up @@ -40,7 +40,7 @@ LCM is written in C++17. The following tools are used for development:
* [Qt6 or Qt5](https://www.qt.io/) for the user interface and the storing and loading of tables.
* If no Qt6 installation is found on the system, the application searches for a Qt5 installation instead.
* Note that for the correct displaying of svg files, the Qt SVG plugin is needed.
* [Catch2](https://github.com/catchorg/Catch2) for Unit testing ([Catch2 license](https://github.com/catchorg/Catch2/blob/devel/LICENSE.txt))
* [Catch2 v3](https://github.com/catchorg/Catch2) for Unit testing ([Catch2 license](https://github.com/catchorg/Catch2/blob/devel/LICENSE.txt))
* [Uncrustify](https://github.com/uncrustify/uncrustify) for code formatting.
* CMake as build system.

Expand Down
2 changes: 1 addition & 1 deletion src/ui/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ MainWindow::about()
QMessageBox::about(this, tr("About Light Combat Manager"),
tr("<p>Light Combat Manager. A small, lightweight Combat Manager for d20-based role playing games.<br>"
"<a href='https://github.com/MaxFleur/LightCombatManager'>Code available on Github.</a></p>"
"<p>Version 2.1.0.<br>"
"<p>Version 2.2.0.<br>"
"<a href='https://github.com/MaxFleur/LightCombatManager/releases'>Changelog</a></p>"));
}

Expand Down

0 comments on commit feba060

Please sign in to comment.