summaryrefslogtreecommitdiffstats
path: root/tools/installer/nsis/includes/system.nsh
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-09-04 13:12:40 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-09-04 13:12:40 (GMT)
commite15ab744f15127422ef62a0b70e6cf129f52f48f (patch)
tree72352e1e297f0322610234c2eeb994820407616e /tools/installer/nsis/includes/system.nsh
parent04802c1fe74439111c7bbe92fcb777dcbd618500 (diff)
parentb3b9813f1083fc556aea1f952329551da97aee90 (diff)
downloadQt-e15ab744f15127422ef62a0b70e6cf129f52f48f.zip
Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.gz
Qt-e15ab744f15127422ef62a0b70e6cf129f52f48f.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/installer/nsis/includes/system.nsh')
-rw-r--r--tools/installer/nsis/includes/system.nsh5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index 8b0b4b9..5788eb8 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -37,9 +37,6 @@
;;
;; $QT_END_LICENSE$
;;
-;; This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-;; WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
!ifndef SYSTEM_INCLUDE
!define SYSTEM_INCLUDE
@@ -269,4 +266,4 @@ FunctionEnd
!insertmacro AdministratorRights ""
!insertmacro AdministratorRights "un."
-!endif ;SYSTEM_INCLUDE \ No newline at end of file
+!endif ;SYSTEM_INCLUDE