diff options
| author | Alex <qt-info@nokia.com> | 2011-03-15 15:57:08 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2011-03-15 15:57:08 +1000 |
| commit | ec71bad9594ea7b954f6dc76b8028853074f9093 (patch) | |
| tree | b5e08d0cbcfe0bf88e3f9d3543c97d977550c967 /bin | |
| parent | f242e920fb32f7b108419ce5d46b490cd5b4f3ca (diff) | |
| parent | 800f67015a66cba3f67a99f6e3e1255023d5ae25 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo
Conflicts:
plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
plugins/declarative/systeminfo/qdeclarativenetworkinfo_p.h
Diffstat (limited to 'bin')
| -rwxr-xr-x[-rw-r--r--] | bin/servicedbgen | bin | 4425774 -> 1255312 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/bin/servicedbgen b/bin/servicedbgen Binary files differindex 74e6a26db2..fd0f206b27 100644..100755 --- a/bin/servicedbgen +++ b/bin/servicedbgen |