summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 21:30:52 +0000
committermostynb@opera.com <mostynb@opera.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-09 21:30:52 +0000
commit3f142971a8ff669cd84001a5de65438bd7b3859a (patch)
treed115c02bb2f9ee3f8a494ad82e9aad962237dfd4
parent8dec4d09a4b963fe41e8dc36584bea451c7b39fd (diff)
downloadchromium_src-3f142971a8ff669cd84001a5de65438bd7b3859a.zip
chromium_src-3f142971a8ff669cd84001a5de65438bd7b3859a.tar.gz
chromium_src-3f142971a8ff669cd84001a5de65438bd7b3859a.tar.bz2
Roll Breakpad r1240:r1247.
r1247: Back out r1244 r1246: switch armv7 setting to arm_version==7 in breakpad r1245: Add include guards and avoid redefinition of false/true in convert_UTF. r1244: Avoid redefinition of global static debug flag and remove unneeded #import "GTMDefines.h r1243: Do not read CFI section when not outputing CFI information. r1242: Fix unused method warning. r1241: Fixing several instances of wrong printf format specifiers. BUG=234135 Review URL: https://codereview.chromium.org/100923006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239555 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bcbb809..7d6f793 100644
--- a/DEPS
+++ b/DEPS
@@ -65,7 +65,7 @@ vars = {
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1240",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1247",
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@42",