AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bad merge which broke compiles.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@1716 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
tomhudson@google.com 2011-06-24 19:15:57 +00:00
parent 4eed340935
commit f5f83e1f7e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/MatrixBench.cpp
View File

@ -295,8 +295,6 @@ class ScaleTransMixedMatrixBench : public MatrixBench {
SkRandom fRandom;
typedef MatrixBench INHERITED;
};
>>>>>>> .r1709
class ScaleTransDoubleMatrixBench : public MatrixBench {
public: