summaryrefslogtreecommitdiff
path: root/libresourceqt/src/resource-set.cpp
diff options
context:
space:
mode:
authorRobert Löfman <ext-robert.lofman@nokia.com>2010-12-01 15:36:20 +0200
committerRobert Löfman <ext-robert.lofman@nokia.com>2010-12-01 15:36:20 +0200
commitef6d735381083c0e90b122f6a22771c13337b8c1 (patch)
tree4f69feab50e681ed253ba8d8d0fe4ea6ce0987c8 /libresourceqt/src/resource-set.cpp
parent248ec24e0e776588278053c33bef18be52c489c2 (diff)
parent2db176e028c54684e2fe6adf58ab0c5807d298c9 (diff)
downloadlibresourceqt-ef6d735381083c0e90b122f6a22771c13337b8c1.tar.gz
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/src/resource-set.cpp')
0 files changed, 0 insertions, 0 deletions