projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4ad12bb eab9b56)
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 23:49:48 +0000 (09:49 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 23:49:48 +0000 (09:49 +1000)
commit2707cdd482c975e58a4736ac85c32af45435f561
treeba81c9b17dfdbfb5ab0b5dbd8d6c836cac1b64c3tree | snapshot
parent4ad12bb65aa46b3ba1cd8aa43716c2832842a2aecommit | diff
parenteab9b566d8e7cd98dd69cbcfc39393192a9e6efacommit | diff
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  CLucene: Use the right delete operator.
  Examples: Fix compilation with namespace.
  fix build with QT_NO_BEARERMANAGEMENT
6b46b7419a5aee9bd5fce67b7bfa8afe8e