OSDN Git Service

Merge branch 'master' of ../master into qmljsinspector
authorRoberto Raggi <roberto.raggi@nokia.com>
Thu, 1 Jul 2010 09:28:57 +0000 (11:28 +0200)
committerRoberto Raggi <roberto.raggi@nokia.com>
Thu, 1 Jul 2010 09:28:57 +0000 (11:28 +0200)
commit16dc17b81d4658767ef31e794f9d4f309fd1bb59
tree74542475dc3ed4d9aea54e285c5dcc0de3226e60
parentf31d299d51ecfc7b31674f319bfd389d03863a80
parent6dc4a039f2cb50a02a0e15265548547b94a6dc9d
Merge branch 'master' of ../master into qmljsinspector

Conflicts:
src/plugins/qmlinspector/qmlinspector.cpp
src/plugins/qmljsinspector/qmljsinspectorcontext.cpp
src/plugins/qmljsinspector/qmljsinspectorplugin.cpp
src/plugins/qmljsinspector/qmljsinspectorcontext.cpp