summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-26 13:53:12 (GMT)
committeraxis <qt-info@nokia.com>2010-01-26 13:53:12 (GMT)
commitfa81d43f8bba47286e3f16b7aa092822c7bd5f7e (patch)
tree2ae250485fa9191c07894a6bf02c8d154f3b0bd3 /bin
parentd64407cf376c5723663ebe81f156a3da98d7df24 (diff)
parent9175f9e5bad0f77e5d53751a8e839c8ea7df4c23 (diff)
downloadQt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.zip
Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.gz
Qt-fa81d43f8bba47286e3f16b7aa092822c7bd5f7e.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts: mkspecs/common/symbian/symbian.conf src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'bin')
-rw-r--r--bin/patch_capabilities.bat1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/patch_capabilities.bat b/bin/patch_capabilities.bat
new file mode 100644
index 0000000..6a0c4d7
--- /dev/null
+++ b/bin/patch_capabilities.bat
@@ -0,0 +1 @@
+@perl.exe -S %~dp0patch_capabilities.pl %*