| Index: cc/quads/yuv_video_draw_quad.h.rej
|
| diff --git a/cc/quads/yuv_video_draw_quad.h.rej b/cc/quads/yuv_video_draw_quad.h.rej
|
| deleted file mode 100644
|
| index a838a4d47dc6c225616567fc823d3416624a44bc..0000000000000000000000000000000000000000
|
| --- a/cc/quads/yuv_video_draw_quad.h.rej
|
| +++ /dev/null
|
| @@ -1,9 +0,0 @@
|
| -diff a/cc/quads/yuv_video_draw_quad.h b/cc/quads/yuv_video_draw_quad.h (rejected hunks)
|
| -@@ -8,7 +8,6 @@
|
| - #include "base/basictypes.h"
|
| - #include "base/memory/scoped_ptr.h"
|
| - #include "cc/base/cc_export.h"
|
| --#include "cc/layers/video_layer_impl.h"
|
| - #include "cc/quads/draw_quad.h"
|
| -
|
| - namespace cc {
|
|
|