commit fe8592ee994343821c8c4e906ee3bef3b4444e34
author Craig Tiller <craig.tiller@gmail.com> Thu Jun 25 07:00:18 2015 -0700
committer Craig Tiller <craig.tiller@gmail.com> Thu Jun 25 07:00:18 2015 -0700
tree a0f1fa88e0ddeb4092567adc51184ac88f0ab78b
parent f75fc12e3a1a614ee2d5d565742764e47d9aef96
parent 0bf7e48ade52eec336f50dee4c7d22eeb887bb8e

Merge github.com:grpc/grpc into are-includes-sane

Conflicts:
	tools/doxygen/Doxyfile.c++.internal

tools/run_tests/sources_and_headers.json

diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index ff985b3..4092759 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -199,7 +199,6 @@
   }, 
   {
     "deps": [
-      "grpc_test_util", 
       "gpr", 
       "grpc"
     ], 
@@ -207,7 +206,7 @@
     "language": "c", 
     "name": "gen_hpack_tables", 
     "src": [
-      "src/core/transport/chttp2/gen_hpack_tables.c"
+      "tools/codegen/core/gen_hpack_tables.c"
     ]
   }, 
   {