diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-11 13:31:09 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-11 13:31:41 +0200 |
| commit | 4072c25a70acaa11e7831848c327be7886ef473e (patch) | |
| tree | 5e586534916bc8a74dc51439c8601940f288606f /.commit-template | |
| parent | ea9702923e86fc3decadbc831e31b349bd40ac44 (diff) | |
| parent | 770893c71b179aa87c1bf2d83318ba62c8c2aa96 (diff) | |
Merge branch 'stable' into dev
Conflicts:
qt.pro
Change-Id: I21548a5c5c060939c58305bcbc5732d90f90bf82
Diffstat (limited to '.commit-template')
| -rw-r--r-- | .commit-template | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/.commit-template b/.commit-template index f7933986..b7c00b82 100644 --- a/.commit-template +++ b/.commit-template @@ -11,8 +11,22 @@ # # Solicit reviewers. They still need to use the Gerrit frontend. #Reviewed-by: - +# +# Change log entry (see below for instructions). +#[ChangeLog][][] +# # ==[ Please wrap at 72 characters ]===================================| # # Remember to read http://wiki.qt-project.org/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, +# add a change log entry. It can be multiple lines long and ends with an +# empty newline. +# Use the module name to indicate the area of the change e.g. [QtCore]. +# Optionally specify a class or subtopic [QtNetwork][QSslSocket]. +# Other common tags are: [General], [Important Behavior Changes], +# [Platform Specific Changes][Windows][OS X][Linux/XCB]. +# +# [ChangeLog][module][class/topic] description of the really important +# change that was just made on several lines. |