commit | a136fc2e5a8893a02b0912862d26a575fcbd641a | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Jul 26 14:22:54 2016 -0700 |
committer | Xin Li <delphij@google.com> | Mon Aug 15 22:30:45 2016 +0000 |
tree | 341dc6790424526b424173dc7bc5a1165db7de10 | |
parent | edb5870767fed8712a9b77ef34097209b61ab2db [diff] [blame] |
Merge remote-tracking branch 'goog/upstream-master' into mymerge BUG: 29834751 Change-Id: I88fc1d4f86bcbd0ac0fe9acdbe764f3d738c5f32 (cherry picked from commit e3d78e1fe0669e9c7083a4de19f1e06171849b28)
diff --git a/rngparser.c b/rngparser.c index e681e0c..7731d4d 100644 --- a/rngparser.c +++ b/rngparser.c
@@ -95,7 +95,7 @@ xmlHashTablePtr datatypes; /* - * dictionnary and keywords + * dictionary and keywords */ xmlDictPtr dict; const xmlChar *key_attribute;