diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-25 11:54:44 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-25 11:54:44 +0200 |
| commit | efa5a7b6d76c85423e45b85e3db97186dc2d1923 (patch) | |
| tree | 096f1a42d2b5943c742e1302489d548edfb026a4 /src/plugins/cvs | |
| parent | c8962c34baae380f7db9840da419998007411226 (diff) | |
| parent | 41127e0f4769bd32f3f5d88c2064ba61f222e195 (diff) | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qtcreator.pri
Change-Id: If5f4a9821a23ac0df81eb84b3980f9cf7ecd70ba
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/CVS.json.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/cvs/CVS.json.in b/src/plugins/cvs/CVS.json.in index d18e228f1d..1efdd73d48 100644 --- a/src/plugins/cvs/CVS.json.in +++ b/src/plugins/cvs/CVS.json.in @@ -17,13 +17,13 @@ \"Url\" : \"http://www.qt.io\", $$dependencyList, - \"Mimetypes\" : \" - <?xml version=\'1.0\'?> - <mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'> - <mime-type type=\'text/vnd.qtcreator.cvs.submit\'> - <comment>CVS submit template</comment> - <sub-class-of type=\'text/plain\'/> - </mime-type> - </mime-info> - \" + \"Mimetypes\" : [ + \"<?xml version=\'1.0\'?>\", + \"<mime-info xmlns=\'http://www.freedesktop.org/standards/shared-mime-info\'>\", + \" <mime-type type=\'text/vnd.qtcreator.cvs.submit\'>\", + \" <comment>CVS submit template</comment>\", + \" <sub-class-of type=\'text/plain\'/>\", + \" </mime-type>\", + \"</mime-info>\" + ] } |