summaryrefslogtreecommitdiffstats
path: root/mkspecs/win32-borland
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-16 07:06:56 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-06-16 07:06:56 (GMT)
commit52c5ea949df2e635418a5542146d469fde8416a5 (patch)
treee8b53ad0a8c0366d84a5752ce88d14a79efa1aa1 /mkspecs/win32-borland
parent4f734500e1833d43805d39747f94bb77e47ebbe3 (diff)
parentde3e3d6bff2b585524cd504cf052cf181a6c2eae (diff)
downloadQt-52c5ea949df2e635418a5542146d469fde8416a5.zip
Qt-52c5ea949df2e635418a5542146d469fde8416a5.tar.gz
Qt-52c5ea949df2e635418a5542146d469fde8416a5.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts: demos/embedded/fluidlauncher/config_s60/config.xml
Diffstat (limited to 'mkspecs/win32-borland')
0 files changed, 0 insertions, 0 deletions