summaryrefslogtreecommitdiffstats
path: root/.hgignore
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-06 06:38:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-06 06:38:58 (GMT)
commit9754c200aa325614e05e6b00e3adedbdda1d161a (patch)
tree9298314e82171bccdd6568c0385d238086e21cbc /.hgignore
parenteb126c11c72c82baf55f4b62e69cb138f4dce059 (diff)
parentf505196fdec6a0d855eb554a92f5e03b61df1e68 (diff)
downloadQt-9754c200aa325614e05e6b00e3adedbdda1d161a.zip
Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.tar.gz
Qt-9754c200aa325614e05e6b00e3adedbdda1d161a.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding a threshold for partial updates. Fixed arm X11 build.
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions