summaryrefslogtreecommitdiffstats
path: root/LICENSE.PREVIEW.COMMERCIAL
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-09 08:47:04 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-09 08:47:04 (GMT)
commit6bdc4043f4d89da39cbbf67a5db4f0e308b632f1 (patch)
treee4838e4e7c527b71c72706e85c8b3cc0eef322f8 /LICENSE.PREVIEW.COMMERCIAL
parent67645790afd965e3fdf312d5233d7c2f0dc3619a (diff)
parentc363cd989a07056b0b8ea39e44c719512bb1e619 (diff)
downloadQt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.zip
Qt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.tar.gz
Qt-6bdc4043f4d89da39cbbf67a5db4f0e308b632f1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts: src/opengl/qgl.cpp src/opengl/qgl_p.h src/opengl/qpaintengine_opengl.cpp
Diffstat (limited to 'LICENSE.PREVIEW.COMMERCIAL')
-rw-r--r--LICENSE.PREVIEW.COMMERCIAL2
1 files changed, 2 insertions, 0 deletions
diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL
index 072c7e8..45740cb 100644
--- a/LICENSE.PREVIEW.COMMERCIAL
+++ b/LICENSE.PREVIEW.COMMERCIAL
@@ -1,3 +1,5 @@
+TECHNOLOGY PREVIEW LICENSE AGREEMENT
+
For individuals and/or legal entities resident in the Americas (North
America, Central America and South America), the applicable licensing
terms are specified under the heading "Technology Preview License