diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-03-08 11:39:33 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-03-08 11:39:33 +0100 |
| commit | f60873a24fbdb70c5da60ecc125a7f70ef130563 (patch) | |
| tree | c43ad3938b919ed84637f8b27a8447ac54d284f2 /dist | |
| parent | 934bccbc7e4f0f977f036c5fda9cd44b257cadaa (diff) | |
| parent | ce49ca841bdc5786860f78d3619c0a740d41a488 (diff) | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/installer/ifw/config/config-linux.xml.in | 1 | ||||
| -rw-r--r-- | dist/installer/ifw/config/config-windows.xml.in | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/dist/installer/ifw/config/config-linux.xml.in b/dist/installer/ifw/config/config-linux.xml.in index 4bc8a0c539..837d5d1dbf 100644 --- a/dist/installer/ifw/config/config-linux.xml.in +++ b/dist/installer/ifw/config/config-linux.xml.in @@ -3,7 +3,6 @@ <Name>Qt Creator</Name> <Version>{version}</Version> <Title>Qt Creator {version}</Title> - <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle> <Publisher>Qt Project</Publisher> <ProductUrl>http://qt-project.org</ProductUrl> diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in index 4d814a4f29..4bbb77b97d 100644 --- a/dist/installer/ifw/config/config-windows.xml.in +++ b/dist/installer/ifw/config/config-windows.xml.in @@ -3,7 +3,6 @@ <Name>Qt Creator</Name> <Version>{version}</Version> <Title>Qt Creator {version}</Title> - <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle> <Publisher>Qt Project</Publisher> <ProductUrl>http://qt-project.org</ProductUrl> |