diff options
| author | Bill King <bill.king@nokia.com> | 2009-08-05 03:45:19 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-08-05 03:45:19 (GMT) |
| commit | bd51c3010e78925a2074122b281de53f01be9ef9 (patch) | |
| tree | 23ac1bb378caebd0072b54fd191932ac65ac1b35 /src/gui/text/qsyntaxhighlighter.h | |
| parent | a4ede01350b506c9908241f0b9002f560cc0949f (diff) | |
| parent | 7e8e53cded4622ac35ff115e26e074de6722d1a0 (diff) | |
| download | Qt-bd51c3010e78925a2074122b281de53f01be9ef9.zip Qt-bd51c3010e78925a2074122b281de53f01be9ef9.tar.gz Qt-bd51c3010e78925a2074122b281de53f01be9ef9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/gui/text/qsyntaxhighlighter.h')
0 files changed, 0 insertions, 0 deletions