Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 19 Dec 2011 22:20:41 +0000 (08:20 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 19 Dec 2011 22:20:41 +0000 (08:20 +1000)
commit8d87a34453fe0f18ebee5a9a0a4edd6f58b896ef
treec107c88a8cc37364f8bcbd0ab9f8b4407b756400
parent6bc85e66c3c3ba837dc6720222f73e53f2df7fa3
parentcb416ae734f39464d4481adbc56f57ba06ecadb7
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Fix a bug where 'int'  is not printed in snippets.