diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-12 08:29:29 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-12 08:29:29 (GMT) |
| commit | af26ef4356cf2bf8ccbcb391b488ddf301dbb2fe (patch) | |
| tree | 0656dec3fdf12abbf37a48d65f0adb01d54bbb59 /demos/demobase.pri | |
| parent | bccd5442f24ce18e08ec5a5e78ccc6566f4e0463 (diff) | |
| parent | 53cfa304345df1cd7b7686a2ebc1acd74a886886 (diff) | |
| download | Qt-af26ef4356cf2bf8ccbcb391b488ddf301dbb2fe.zip Qt-af26ef4356cf2bf8ccbcb391b488ddf301dbb2fe.tar.gz Qt-af26ef4356cf2bf8ccbcb391b488ddf301dbb2fe.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/network/ssl/ssl.pri
Diffstat (limited to 'demos/demobase.pri')
0 files changed, 0 insertions, 0 deletions