gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Gennadiy Civil
2018-09-23 12:10:40 -07:00
committed by GitHub
parent 81c0b876b4 c7a429a667
commit fd17c91bad
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.clang-format Normal file
View File

@@ -0,0 +1,4 @@
# Run manually to reformat a file:
# clang-format -i --style=file <file>
Language: Cpp
BasedOnStyle: Google

1
CONTRIBUTING.md
View File

@@ -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 ###

2
README.md
View File

@@ -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 ###