projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5e2f64e
)
Merge rather than replace identical sections in QSS
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 22 Jul 2009 23:13:51 +0000
(
01:13
+0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Thu, 6 Aug 2009 18:25:05 +0000
(20:25 +0200)
src/uisupport/qssparser.cpp
patch
|
blob
|
history
diff --git
a/src/uisupport/qssparser.cpp
b/src/uisupport/qssparser.cpp
index
8e917b7
..
c6b69d9
100644
(file)
--- a/
src/uisupport/qssparser.cpp
+++ b/
src/uisupport/qssparser.cpp
@@
-127,7
+127,7
@@
void QssParser::parseChatLineData(const QString &decl, const QString &contents)
}
}
- _formats[fmtType]
= format
;
+ _formats[fmtType]
.merge(format)
;
}
quint64 QssParser::parseFormatType(const QString &decl) {