Merging trunk revs up to 6147 into gpu_dev.

git-svn-id: http://skia.googlecode.com/svn/branches/gpu_dev@6149 2bbb7eff-a529-9590-31e7-b0007b416f81
2012-10-26 19:14:16 +00:00 · 2012-10-26 19:14:16 +00:00 · 4d3f8b40e3
commit 4d3f8b40e3
parent 2d0baded0f de96163a80
2 changed files with 665 additions and 650 deletions
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
--- a/whitespace.txt
+++ b/whitespace.txt
@ -51,5 +51,6 @@ You can modify this file to create no-op changelists.



+
				`@ -51,5 +51,6 @@ You can modify this file to create no-op changelists.`