diff options
| author | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
|---|---|---|
| committer | Vladimir Minenko <vladimir.minenko@nokia.com> | 2011-05-26 13:56:47 (GMT) |
| commit | aff6cbac0eeaa0f1184cfa6f69818827b71cb222 (patch) | |
| tree | 93b579a4879a8c9d33dbcdbafffe8fb363d71c78 /demos/spectrum | |
| parent | 4ec80735d3e8bdbc4e38288c974426e77eedcd00 (diff) | |
| parent | 0f8eddaf60e3854aeda4c5d16cd740cc510ca941 (diff) | |
| download | Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.zip Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.gz Qt-aff6cbac0eeaa0f1184cfa6f69818827b71cb222.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Conflicts:
doc/src/external-resources.qdoc
doc/src/getting-started/how-to-learn-qt.qdoc
"external-resources.qdoc" manually merged
"how-to-learn-qt.qdoc" was unchanged, so it was updated to a new, reworked version from the working area
Diffstat (limited to 'demos/spectrum')
0 files changed, 0 insertions, 0 deletions