diff options
| author |  Shanqing Cai <cais@google.com> | 2017-04-22 14:10:11 -0400 |
|---|---|---|
| committer | Shanqing Cai <cais@google.com> | 2017-04-22 14:10:11 -0400 |
| commit | 92675de336721b0d03902a0fa5a07685a3269162 (patch) | |
| tree | 6395e7839a2c600607fd3801f36561cb5941ba7b /third_party/html5lib.BUILD | |
| parent | 48d9915ebca770b40c4497a13c3edb87b6b042d0 (diff) | |
| parent | 326942394e69074d50d5889218a24c9371eff259 (diff) | |
Merge commit for internal changes
Manually fixed conflicts by accepting --ours:
tensorflow/contrib/slim/README.md
Manually fixed conflicts by accepting --theirs:
tensorflow/contrib/learn/python/learn/datasets/mnist.py
tensorflow/contrib/verbs/BUILD
tensorflow/contrib/verbs/grpc_verbs_client.cc
tensorflow/contrib/verbs/grpc_verbs_client.h
tensorflow/contrib/verbs/grpc_verbs_service.cc
tensorflow/contrib/verbs/grpc_verbs_service.h
tensorflow/contrib/verbs/grpc_verbs_service_impl.cc
tensorflow/contrib/verbs/grpc_verbs_service_impl.h
tensorflow/contrib/verbs/rdma.cc
tensorflow/contrib/verbs/rdma.h
tensorflow/contrib/verbs/rdma_mgr.cc
tensorflow/contrib/verbs/rdma_mgr.h
tensorflow/contrib/verbs/rdma_rendezvous_mgr.cc
tensorflow/contrib/verbs/rdma_rendezvous_mgr.h
tensorflow/contrib/verbs/verbs_server_lib.cc
tensorflow/contrib/verbs/verbs_server_lib.h
tensorflow/contrib/verbs/verbs_service.proto
tensorflow/contrib/verbs/verbs_util.cc
tensorflow/contrib/verbs/verbs_util.h
tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
tensorflow/core/framework/function_testlib.cc
tensorflow/core/graph/mkl_layout_pass.cc
tensorflow/core/graph/mkl_layout_pass_test.cc
tensorflow/core/graph/mkl_tfconversion_pass.cc
tensorflow/core/graph/mkl_tfconversion_pass_test.cc
tensorflow/core/kernels/fixed_length_record_reader_op.cc
tensorflow/core/kernels/mkl_concat_op.cc
tensorflow/core/kernels/mkl_conv_grad_bias_ops.cc
tensorflow/core/kernels/mkl_conv_grad_filter_ops.cc
tensorflow/core/kernels/mkl_conv_grad_input_ops.cc
tensorflow/core/kernels/mkl_conv_ops.cc
tensorflow/core/kernels/mkl_fused_batch_norm_op.cc
tensorflow/core/kernels/mkl_lrn_op.cc
tensorflow/core/kernels/mkl_relu_op.cc
tensorflow/core/kernels/mkl_reshape_op.cc
tensorflow/core/kernels/mkl_tfconv_op.cc
tensorflow/core/kernels/sparse_tensor_dense_matmul_op.cc
tensorflow/core/kernels/sparse_tensor_dense_matmul_op.h
tensorflow/core/kernels/sparse_tensor_dense_matmul_op_gpu.cu.cc
tensorflow/core/ops/array_ops.cc
tensorflow/core/ops/nn_ops.cc
tensorflow/core/util/mkl_util.h
tensorflow/examples/tutorials/mnist/mnist_with_summaries.py
tensorflow/python/kernel_tests/reader_ops_test.py
tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_grad_test.py
tensorflow/python/kernel_tests/sparse_tensor_dense_matmul_op_test.py
tensorflow/python/ops/io_ops.py
tensorflow/python/ops/nn_impl.py
tensorflow/python/ops/sparse_grad.py
tensorflow/tensorboard/gulp_tasks/vulcanize.js
third_party/jemalloc.BUILD
Diffstat (limited to 'third_party/html5lib.BUILD')
0 files changed, 0 insertions, 0 deletions