| Index: cc/output/gl_renderer.cc.rej
|
| diff --git a/cc/output/gl_renderer.cc.rej b/cc/output/gl_renderer.cc.rej
|
| deleted file mode 100644
|
| index 3cf4e178707b01649195e10784f3100bca4b4841..0000000000000000000000000000000000000000
|
| --- a/cc/output/gl_renderer.cc.rej
|
| +++ /dev/null
|
| @@ -1,9 +0,0 @@
|
| -diff a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc (rejected hunks)
|
| -@@ -18,7 +18,6 @@
|
| - #include "build/build_config.h"
|
| - #include "base/trace_event/trace_event.h"
|
| - #include "cc/base/math_util.h"
|
| --#include "cc/layers/video_layer_impl.h"
|
| - #include "cc/output/compositor_frame.h"
|
| - #include "cc/output/compositor_frame_metadata.h"
|
| - #include "cc/output/context_provider.h"
|
|
|