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

Merge remote-tracking branch 'github_google/master' into master-github_frosteyes

Browse Source 
# Conflicts:
#	.gitignore
This commit is contained in:
Claus Stovgaard
2017-08-31 12:22:53 +02:00
parent a6418a4dd1 16bfba08e2
commit 34355c0e87
159 changed files with 3877 additions and 28687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@@ -1,4 +1,12 @@
# Ignore CI build directory
build/
xcuserdata
cmake-build-debug/
.idea/
bazel-bin
bazel-genfiles
bazel-googletest
bazel-out
bazel-testlogs
# python
*.pyc
*.pyc