diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-27 23:05:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-27 23:06:01 (GMT) |
| commit | 85fa83ac89367bf4f3a85d038ef64a362aa8377e (patch) | |
| tree | 706bc6aa64be436480d0d6a0c5603ff31186bfbb /templates/.gitignore | |
| parent | 103e1e8ea5e8879f2bb97e008840a212b3004a51 (diff) | |
| parent | 8f011df08139bea59c12ae0804969334a9374dc8 (diff) | |
| download | Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.zip Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.tar.gz Qt-85fa83ac89367bf4f3a85d038ef64a362aa8377e.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
Diffstat (limited to 'templates/.gitignore')
0 files changed, 0 insertions, 0 deletions