summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-08-14 13:38:53 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-08-14 13:38:53 +0200
commitbf5c38f13669cf44793db48ec7e5138d0ee8295a (patch)
tree05387d0191db2c6d2c3290559a652e35f6a27083
parent30e19df5bf2bd6c1ce895d5ce9cb3fbfb4f88da6 (diff)
parent3f2ff8b460e8ab7f5f31523108f7403b8143e471 (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5
-rw-r--r--.commit-template2
-rw-r--r--README.git4
2 files changed, 3 insertions, 3 deletions
diff --git a/.commit-template b/.commit-template
index 3edc08db..26441ac5 100644
--- a/.commit-template
+++ b/.commit-template
@@ -14,7 +14,7 @@
#
# ==[ Please wrap at 72 characters ]===================================|
#
-# Remember to read http://wiki.qt-project.org/Commit_Policy
+# Remember to read http://wiki.qt.io/Commit_Policy
#
# Change log entry: If this commit adds a significant feature, fixes an
# issue or contains a behavior change that is relevant to others,
diff --git a/README.git b/README.git
index 7934bea9..201612be 100644
--- a/README.git
+++ b/README.git
@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
========
For a more in-depth description on how to build Qt5 from git,
- please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
+ please see: http://wiki.qt.io/Building_Qt_5_from_Git
Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
================================
For more information on how to develop and contribute to Qt, please see:
- http://qt-project.org/wiki/Category:Developing_Qt
+ http://wiki.qt.io/Category:Developing_Qt