summaryrefslogtreecommitdiffstats
path: root/INSTALL
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2011-07-08 11:56:47 (GMT)
committerJerome Pasion <jerome.pasion@nokia.com>2011-07-08 11:56:47 (GMT)
commit93ae002230888e98b4e95834f5e5eb9600f05f18 (patch)
tree9449cc65b856b4743e933cf2b8ae1cb2f85ba9fd /INSTALL
parent8b89d0aa973c52b44112f10c9fbd9701b17bb333 (diff)
parent1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff)
downloadQt-93ae002230888e98b4e95834f5e5eb9600f05f18.zip
Qt-93ae002230888e98b4e95834f5e5eb9600f05f18.tar.gz
Qt-93ae002230888e98b4e95834f5e5eb9600f05f18.tar.bz2
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts: doc/src/external-resources.qdoc
Diffstat (limited to 'INSTALL')
0 files changed, 0 insertions, 0 deletions