diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 21:18:06 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-08 21:18:06 +0000 |
| commit | 782ce0676a7ab49b411d44a953637ad4805bc4ea (patch) | |
| tree | 8e9c2b6734753d4a9886f3ce78dc94381e5c88bc /o3d/import | |
| parent | 397189ee96ffd74d8edd01c2dcfa5708981948cd (diff) | |
| download | chromium_src-782ce0676a7ab49b411d44a953637ad4805bc4ea.zip chromium_src-782ce0676a7ab49b411d44a953637ad4805bc4ea.tar.gz chromium_src-782ce0676a7ab49b411d44a953637ad4805bc4ea.tar.bz2 | |
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
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/collada.cc | 2 | ||||
| -rw-r--r-- | o3d/import/cross/collada_conditioner.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/import/cross/collada.cc b/o3d/import/cross/collada.cc index 562641f..6047da0 100644 --- a/o3d/import/cross/collada.cc +++ b/o3d/import/cross/collada.cc @@ -36,7 +36,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/process_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "core/cross/class_manager.h" #include "core/cross/curve.h" #include "core/cross/error.h" diff --git a/o3d/import/cross/collada_conditioner.cc b/o3d/import/cross/collada_conditioner.cc index d9c0551b..b5fef31 100644 --- a/o3d/import/cross/collada_conditioner.cc +++ b/o3d/import/cross/collada_conditioner.cc @@ -36,7 +36,7 @@ #include "base/file_path.h" #include "base/file_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "compiler/technique/technique_parser.h" #include "core/cross/error.h" #include "core/cross/types.h" |