summaryrefslogtreecommitdiffstats
path: root/dist/changes-3.0.0-beta1
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
committerMorten Sørvig <msorvig@trolltech.com>2009-08-24 14:02:51 +0200
commite3078a5db9e092d78813180ce077789551929e4f (patch)
treefce2a4b5607c8dc796faececf71f78ae83effe4e /dist/changes-3.0.0-beta1
parent3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff)
parentdb0ebfd97d14bf3c537957d9642ba014318f8418 (diff)
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'dist/changes-3.0.0-beta1')
-rw-r--r--dist/changes-3.0.0-beta15
1 files changed, 2 insertions, 3 deletions
diff --git a/dist/changes-3.0.0-beta1 b/dist/changes-3.0.0-beta1
index 2c73e7744..37f4c3662 100644
--- a/dist/changes-3.0.0-beta1
+++ b/dist/changes-3.0.0-beta1
@@ -405,9 +405,8 @@ QMake
To ease portability we now provide the qmake utility to replace tmake.
QMake is a C++ version of tmake which offers additional functionallity
-that is difficult to reproduce in tmake. Trolltech uses qmake in its
-build system for Qt and related products and we have released it as
-free software.
+that is difficult to reproduce in tmake. Qt uses qmake in its build
+system and we have released it as free software.
Qt Functions