Merge github.com:grpc/grpc into sceq

zhaoyingcan · Feb 10, 2016 · f734299 · f734299
2 parents 7e5a9cf + bfe240e
commit f734299
Show file tree

Hide file tree

Showing 464 changed files with 15,368 additions and 7,077 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,9 @@ coverage
 # Makefile's cache
 cache.mk
 
+# Ruby's local gem information
+Gemfile.lock
+
 # Temporary test reports
 report.xml
 latency_trace.txt
@@ -61,7 +64,7 @@ out
 .ycm_extra_conf.py
 
 # XCode
-build/
+^build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3