Merge branch 'release-1.6.10'

Cocoanetics · Dec 18, 2013 · a34d9eb · a34d9eb
2 parents 1059330 + 944df7e
commit a34d9eb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Core/Source/DTCSSStylesheet.h b/Core/Source/DTCSSStylesheet.h
@@ -68,6 +68,7 @@
  
  @param element The HTML element.
  @param matchedSelectors The CSS selectors that caused a match
+ @param ignoreInlineStyle If `YES` then the inline styles of the element will be ignored and only the receiver's styles used
  @returns The merged style dictionary containing only styles which selector matches the element
  */
 - (NSDictionary *)mergedStyleDictionaryForElement:(DTHTMLElement *)element matchedSelectors:(NSSet **)matchedSelectors ignoreInlineStyle:(BOOL)ignoreInlineStyle;