diff options
| author | Alex <qt-info@nokia.com> | 2010-04-30 06:54:02 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-04-30 06:54:02 +1000 |
| commit | 06eca80d7b1643d69340ee68b510b23d1493fd92 (patch) | |
| tree | 7ec5a70df658f0f0025b8f38e2138a4056367648 /examples/notesmanagerplugin/notesmanagerplugin.cpp | |
| parent | 78e0ce48a8dc4e52b5dbc99b0eb5dc9b2b7c5eef (diff) | |
| parent | 0b793894a5e78bd3a8d916b910c8dc9c04621439 (diff) | |
Merge branch '1.0' of ../qtmobility into 1.0
Conflicts:
examples/sensors/grueplugin/grueplugin.pro
Diffstat (limited to 'examples/notesmanagerplugin/notesmanagerplugin.cpp')
0 files changed, 0 insertions, 0 deletions