Commit Graph

6 Commits

Author SHA1 Message Date
Claus Stovgaard
34355c0e87 Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
#	.gitignore
2017-08-31 12:22:53 +02:00
misterg
b3edada290 WIP 2017-08-01 14:50:59 -04:00
misterg
f63e2a14a2 WIP 2017-08-01 14:36:29 -04:00
Claus Stovgaard
68f19facc2 Moved the ignoring of *.pyc files to top level for also covering googlemock python scripts. 2016-08-30 16:15:46 +02:00
Don Huff
d254052f7f Update C++ language and library settings to match SDK projects. 2016-03-11 07:58:27 -06:00
Jacob Meacham
b648a30721 Add build artifacts to git ignore. 2016-02-16 17:46:14 -08:00