Unverified Commit fd17c91b authored by Gennadiy Civil's avatar Gennadiy Civil Committed by GitHub
Browse files

Merge branch 'master' into master

parents 81c0b876 c7a429a6
# Run manually to reformat a file:
# clang-format -i --style=file <file>
Language: Cpp
BasedOnStyle: Google
...@@ -79,6 +79,7 @@ itself is a valuable contribution. ...@@ -79,6 +79,7 @@ itself is a valuable contribution.
To keep the source consistent, readable, diffable and easy to merge, To keep the source consistent, readable, diffable and easy to merge,
we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project. All patches will be expected we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project. All patches will be expected
to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html). to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html).
Use [.clang-format](https://github.com/google/googletest/blob/master/.clang-format) to check your formatting
## Requirements for Contributors ### ## Requirements for Contributors ###
......
...@@ -107,7 +107,7 @@ package (as described below): ...@@ -107,7 +107,7 @@ package (as described below):
* GNU-compatible Make or gmake * GNU-compatible Make or gmake
* POSIX-standard shell * POSIX-standard shell
* POSIX(-2) Regular Expressions (regex.h) * POSIX(-2) Regular Expressions (regex.h)
* A C++98-standard-compliant compiler * A C++11-standard-compliant compiler
### Windows Requirements ### ### Windows Requirements ###
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment