From b863e77b6372ab4ab77f45b8d883c49fd722a1ac Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sun, 10 Jan 2016 14:56:53 +0200 Subject: [PATCH] Fix newlines in wiki rendering. --- CODING_GUIDELINES.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CODING_GUIDELINES.md b/CODING_GUIDELINES.md index c74cbccd2..28031f201 100644 --- a/CODING_GUIDELINES.md +++ b/CODING_GUIDELINES.md @@ -1,8 +1,8 @@ All new code must follow the following coding guidelines. If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead. -**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style. -**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder. -**Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder. +**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style. +**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder. +**Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder. ### 1. Curly braces ### #### a. Function blocks, class/struct definitions, namespaces ####