diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-04-29 05:34:26 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-04-29 05:34:26 (GMT) |
| commit | 1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf (patch) | |
| tree | 58d500cf278a884d69d5a811a0ff0329c1febc1f /examples/declarative/tutorials/contacts/shared | |
| parent | 012bf05b8c5e37bb102406d79023cb5d875deaac (diff) | |
| parent | 94a698046c2c00a4627607db1f7099880643e829 (diff) | |
| download | Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.zip Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.tar.gz Qt-1aa03e04d8b33b3f6bcffed1946d38bb4cb386bf.tar.bz2 | |
Merge branch 'source' into kinetic-declarativeui
Conflicts:
demos/declarative/mediabrowser/content/PhonesPathView.qml
demos/declarative/mediabrowser/mediabrowser.qml
Diffstat (limited to 'examples/declarative/tutorials/contacts/shared')
| -rw-r--r-- | examples/declarative/tutorials/contacts/shared/contacts.sqlite | bin | 12288 -> 12288 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/tutorials/contacts/shared/contacts.sqlite b/examples/declarative/tutorials/contacts/shared/contacts.sqlite Binary files differindex 7347adc..6918878 100644 --- a/examples/declarative/tutorials/contacts/shared/contacts.sqlite +++ b/examples/declarative/tutorials/contacts/shared/contacts.sqlite |