Added braces to all statements with clang-tidy and ran clang-format again

[lugaru.git] / README.md

diff --git a/README.md b/README.md
index 299ee8dcc1e9decaf58c5f29892f12c1f9bf7c1f..e910a94c3cb4957bc99145c82ffcccdbfef5e5ff 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Lugaru HD
 
 # Lugaru HD
 

-[![build status](https://gitlab.com/osslugaru/lugaru/badges/master/build.svg)](https://gitlab.com/osslugaru/lugaru/commits/master) [![Build status](https://ci.appveyor.com/api/projects/status/bbyr9it27c52fiib/branch/master?svg=true)](https://ci.appveyor.com/project/NealGompa/lugaru/branch/master)
+[![build status](https://gitlab.com/osslugaru/lugaru/badges/master/build.svg)](https://gitlab.com/osslugaru/lugaru/commits/master)

 
 This repository holds the official development effort of the open source game
 Lugaru (and in particular of its HD version) for Linux, Mac OSX and Windows.
 
 This repository holds the official development effort of the open source game
 Lugaru (and in particular of its HD version) for Linux, Mac OSX and Windows.


@@ -18,6 +18,7 @@ commercial version.
 
 This project is community-driven and uses the following communication channels:
 - GitLab repository (including issues): https://gitlab.com/osslugaru/lugaru
 
 This project is community-driven and uses the following communication channels:
 - GitLab repository (including issues): https://gitlab.com/osslugaru/lugaru

+- Project website: https://osslugaru.gitlab.io

 - Mailing list: http://icculus.org/mailman/listinfo/lugaru
 - IRC channel: [#lugaru on Freenode](http://webchat.freenode.net/?channels=lugaru)
 
 - Mailing list: http://icculus.org/mailman/listinfo/lugaru
 - IRC channel: [#lugaru on Freenode](http://webchat.freenode.net/?channels=lugaru)
 


@@ -53,7 +54,7 @@ builds.
 
 ## Compiling
 
 
 ## Compiling
 

-See the `COMPILING.txt` for compilation instructions on all supported
+See the `COMPILING.md` for compilation instructions on all supported

 platforms.
 
 ## Licensing
 platforms.
 
 ## Licensing


@@ -61,9 +62,7 @@ platforms.
 The source code is distributed under the GNU General Public License version 2
 or (at your option) any later version (GPLv2+).
 
 The source code is distributed under the GNU General Public License version 2
 or (at your option) any later version (GPLv2+).
 

-The assets (campaigns, graphical and audio assets, etc.) are distributed
-under various licenses (CC-BY-SA 3.0 and Freeware) as described in the
-`CONTENT-LICENSE.txt` file.
-
-The third party dependencies of the `Dependencies` folder are distributed
-under their respective licenses.
+The assets (campaigns, graphical and audio assets, etc.) in the `Data` folder
+are distributed under the Creative Commons Attribution - Share Alike license,
+some in version 3.0 Unported (CC-BY-SA 3.0) and others in version 4.0
+International (CC-BY-SA 4.0) as described in the `CONTENT-LICENSE.txt` file.