summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 21:45:24 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-30 21:45:24 +0000
commit828823a83da0cd93d3d0a98f1efe8254700b33e2 (patch)
treeb39d64f9f913e455c7a068f1cc68aeb19b84ab60
parent8fcdf63ef631700006c58355128f9586b9878f74 (diff)
downloadchromium_src-828823a83da0cd93d3d0a98f1efe8254700b33e2.zip
chromium_src-828823a83da0cd93d3d0a98f1efe8254700b33e2.tar.gz
chromium_src-828823a83da0cd93d3d0a98f1efe8254700b33e2.tar.bz2
Forgot these 2 files in the last checkin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19661 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/DEPS8
-rw-r--r--o3d/DEPS_gyp8
2 files changed, 8 insertions, 8 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index 2e93062..0aaf0c2 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,7 +2,7 @@ vars = {
"chromium_trunk":
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "25",
- "o3d_code_rev": "85",
+ "o3d_code_rev": "86",
}
deps = {
@@ -36,6 +36,9 @@ deps = {
"o3d/third_party/jpeg":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("o3d_code_rev"),
+ "o3d/third_party/jsdoctoolkit":
+ "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
+
"o3d/third_party/pdiff":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
@@ -91,9 +94,6 @@ deps = {
"o3d/third_party/gmock/files":
"http://googlemock.googlecode.com/svn/tags/release-1.0.0",
-
- "o3d/third_party/jsdoctoolkit/files":
- "http://jsdoc-toolkit.googlecode.com/svn/tags/jsdoc_toolkit-2.1.0/jsdoc-toolkit",
}
deps_os = {
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 6d276c8..ea775e6 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -3,7 +3,7 @@ vars = {
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "25",
"chromium_rev": "19057",
- "o3d_code_rev": "85",
+ "o3d_code_rev": "86",
}
deps = {
@@ -28,6 +28,9 @@ deps = {
"third_party/java":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/java@" + Var("o3d_code_rev"),
+ "third_party/jsdoctoolkit":
+ "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
+
"third_party/pdiff":
"http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
@@ -108,9 +111,6 @@ deps = {
Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
# "http://googlemock.googlecode.com/svn/tags/release-1.0.0",
- "third_party/jsdoctoolkit/files":
- "http://jsdoc-toolkit.googlecode.com/svn/tags/jsdoc_toolkit-2.1.0/jsdoc-toolkit",
-
# Stuff needed for GYP to run
"build":
Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"),