diff options
author | Robert Löfman <ext-robert.lofman@nokia.com> | 2010-12-01 15:36:20 +0200 |
---|---|---|
committer | Robert Löfman <ext-robert.lofman@nokia.com> | 2010-12-01 15:36:20 +0200 |
commit | ef6d735381083c0e90b122f6a22771c13337b8c1 (patch) | |
tree | 4f69feab50e681ed253ba8d8d0fe4ea6ce0987c8 /libresourceqt/include/qt4 | |
parent | 248ec24e0e776588278053c33bef18be52c489c2 (diff) | |
parent | 2db176e028c54684e2fe6adf58ab0c5807d298c9 (diff) |
Merge branch 'master' of ssh://karma.research.nokia.com/u/repositories/libresourceqt
Conflicts:
resourceqt-client/client.cpp
resourceqt-client/client.h
Diffstat (limited to 'libresourceqt/include/qt4')
0 files changed, 0 insertions, 0 deletions