From 782ce0676a7ab49b411d44a953637ad4805bc4ea Mon Sep 17 00:00:00 2001 From: "kbr@google.com" Date: Thu, 8 Jul 2010 21:18:06 +0000 Subject: Rolled forward O3D's Chromium DEPS to match the Skia roll-forward in the last CL, which broke the Linux build due to version mismatches. Thanks to tschmelcher for help with the Linux changes. Built and tested O3D on Windows, Linux and Mac OS X. BUG=none TEST=none Review URL: http://codereview.chromium.org/2952001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51895 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/core/cross/types.h | 1 + 1 file changed, 1 insertion(+) (limited to 'o3d/core') diff --git a/o3d/core/cross/types.h b/o3d/core/cross/types.h index 23e6609..7971ceb 100644 --- a/o3d/core/cross/types.h +++ b/o3d/core/cross/types.h @@ -49,6 +49,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "core/cross/math_types.h" #include "core/cross/float_n.h" -- cgit v1.1