diff options
author | dt <qtc-commiter@nokia.com> | 2008-12-08 12:47:15 +0100 |
---|---|---|
committer | dt <qtc-commiter@nokia.com> | 2008-12-08 12:47:15 +0100 |
commit | 942363913cd907097703ecbbe4a9da98df9613d9 (patch) | |
tree | 04f2068b7588f0d084a938ea0e04da6e18ada5c2 /src/libs/cplusplus/OverviewModel.cpp | |
parent | 83d5461c7f083277ee5948b6b4bbbd93b63415dc (diff) | |
parent | f6fbb274ae715c05fcdee61cba5395b4fd4814b9 (diff) | |
download | qt-creator-942363913cd907097703ecbbe4a9da98df9613d9.tar.gz |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts:
src/plugins/qt4projectmanager/qtversionmanager.cpp
Diffstat (limited to 'src/libs/cplusplus/OverviewModel.cpp')
0 files changed, 0 insertions, 0 deletions