diff options
| author | Alex <qt-info@nokia.com> | 2010-04-07 12:53:57 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-04-07 12:53:57 +1000 |
| commit | 6e5ae4da348a63a7eef07e29727edea134cfe856 (patch) | |
| tree | 51976d90e1b5092eb01999080cf67d219d488050 /doc/src/snippets/sysinfo-snippets/main.cpp | |
| parent | c612c2822c41d37532d471919233f0bc7851406d (diff) | |
| parent | c1c362da9911f8d6dcf7e259a012953b40899c2d (diff) | |
Merge branch '1.0' of ../qtm-serviceframework into 1.0
Conflicts:
examples/examples.pri
src/s60installs/s60installs.pro
Diffstat (limited to 'doc/src/snippets/sysinfo-snippets/main.cpp')
0 files changed, 0 insertions, 0 deletions