Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative
authorMartin Jones <martin.jones@nokia.com>
Tue, 31 May 2011 05:34:37 +0000 (15:34 +1000)
committerMartin Jones <martin.jones@nokia.com>
Tue, 31 May 2011 05:34:37 +0000 (15:34 +1000)
commit3f5a0e123f662e39a10d598a8d7de12c7ff17f69
tree9af6e83fe86701021c05a7eeea008d1899d32623
parent766521d62a4cf4598326a510186b080a91bde6dd
parente789d98c03a8f235520667df6fd27fab9e66055d
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative

Conflicts:
src/declarative/debugger/qpacketprotocol.cpp

Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1
src/declarative/debugger/qdeclarativedebug.cpp
src/declarative/debugger/qpacketprotocol.cpp