diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-05 17:53:51 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-05 17:53:51 +0100 |
| commit | c5daa927663cb0eafa56495bded0d80b21d94e4d (patch) | |
| tree | 9fd75d70b3d07d1e71aa6187ae20d266546f6fcc /src/core/CSS.cpp | |
| parent | 2069538e089696eead64169895c935ff4bc577ba (diff) | |
| parent | b7c2dd440523948bebca54a91a4ba06451b473f0 (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/CSS.cpp')
| -rw-r--r-- | src/core/CSS.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/CSS.cpp b/src/core/CSS.cpp index c3900e8..d131fec 100644 --- a/src/core/CSS.cpp +++ b/src/core/CSS.cpp @@ -20,6 +20,12 @@ namespace ousia { +void RuleSet::merge(Rooted<RuleSet> other){ + for(auto& o : other->rules){ + rules[o.first] = o.second; + } +} + /* * different versions of "getChildren". */ |