tree 4238c48be26e3c07de0a65b8b860cce344271a9c
parent 5507b0f8d5311e1a329251b5c6d51b9d66913364
parent 3e537b48a7b56c742ecf3c2ed24ff15fcb73f575
author Raph Levien <raph@google.com> 1406313909 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1406313909 +0000

am 3e537b48: Merge "Merge from upstream"

* commit '3e537b48a7b56c742ecf3c2ed24ff15fcb73f575':
  Typo
  [util] Note CSS compatibility in --help-features
  Fix snprintf() format
  Make sure broken feature strings are not partially parsed
  Allow quotation marks around feature tag in hb_feature_from_string()
  Allow space at the end of feature string with values, eg 'dlig=1 '
  Minor
  Allow on/off in hb_feature_from_string()
  Remove duplicate definition of ISALNUM
  Fix parsing of features like "- liga" (with the space)
  Do not require the '=' in hb_feature_from_string()
  Reject tags longer than 4 chars in hb_feature_from_string()
  Minor warnings fixes
  [indic] Handle old-spec Malayalam reordering with final Halant
  Give CC to gir-scanner
  0.9.33
  Fix test runner under Windows
  Disallow changing settings on immutable face
  [win] Fix Cygwin build