aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into tooomm-dl_badges

Browse source
This commit is contained in:
tooomm 2017-05-08 10:05:24 +02:00 committed by GitHub
commit 256e40a9ee
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -28,7 +28,7 @@ set(PROJECT_NAME "Cockatrice")
# Can be overriden by git tags, see cmake/getversion.cmake # Can be overriden by git tags, see cmake/getversion.cmake
set(PROJECT_VERSION_MAJOR "2") set(PROJECT_VERSION_MAJOR "2")
set(PROJECT_VERSION_MINOR "3") set(PROJECT_VERSION_MINOR "3")
set(PROJECT_VERSION_PATCH "17") set(PROJECT_VERSION_PATCH "18")
# Default to "Release" build type # Default to "Release" build type
# User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call

6
README.md
View file

@ -29,8 +29,7 @@ We offer downloads for all full releases (recommended) and the latest developmen
- More information can be [found here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels) - More information can be [found here](https://github.com/Cockatrice/Cockatrice/wiki/Release-Channels)
# Get Involved [![Gitter Chat](https://img.shields.io/gitter/room/Cockatrice/Cockatrice.svg)](https://gitter.im/Cockatrice/Cockatrice)
# Get Involved [![Gitter Chat](https://badges.gitter.im/Cockatrice/Cockatrice.png)](https://gitter.im/Cockatrice/Cockatrice)
[Chat](https://gitter.im/Cockatrice/Cockatrice) with the Cockatrice developers on Gitter. Come here to talk about the application, features, or just to hang out. For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br> [Chat](https://gitter.im/Cockatrice/Cockatrice) with the Cockatrice developers on Gitter. Come here to talk about the application, features, or just to hang out. For support regarding specific servers, please contact that server's admin or forum for support rather than asking here.<br>
@ -41,6 +40,7 @@ We try to be very responsive to new issues. We'll try to give you advice on how
# Community Resources # Community Resources
- [Cockatrice Official Site](https://cockatrice.github.io) - [Cockatrice Official Site](https://cockatrice.github.io)
- [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki) - [Cockatrice Official Wiki](https://github.com/Cockatrice/Cockatrice/wiki)
- [reddit r/Cockatrice](https://reddit.com/r/cockatrice) - [reddit r/Cockatrice](https://reddit.com/r/cockatrice)
@ -117,7 +117,7 @@ Please note that running this command will expose the TCP port 4747 of the docke
More infos on how to use Servatrice with Docker can be found in our [wiki](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker). More infos on how to use Servatrice with Docker can be found in our [wiki](https://github.com/Cockatrice/Cockatrice/wiki/Setting-up-Servatrice#using-docker).
# License [![GPLv2 License](https://img.shields.io/badge/license-GPLv2-blue.svg)](https://github.com/Cockatrice/Cockatrice/blob/master/COPYING) # License [![GPLv2 License](https://img.shields.io/github/license/Cockatrice/Cockatrice.svg)](https://github.com/Cockatrice/Cockatrice/blob/master/COPYING)
Cockatrice is free software, licensed under the [GPLv2](https://github.com/Cockatrice/Cockatrice/blob/master/COPYING). Cockatrice is free software, licensed under the [GPLv2](https://github.com/Cockatrice/Cockatrice/blob/master/COPYING).