diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:32:00 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-31 08:32:00 +0100 |
| commit | b17611dbf9145a358504188f8e984c8f3f3671d1 (patch) | |
| tree | 32614c71cd0bb7cfa29ed67ca0792781a22c35f2 | |
| parent | aa801ac198299d5e898d825f869bc7ac488e0f38 (diff) | |
| parent | dae8d26846ce4448e7f5b4e1727c6b3a22fbf76b (diff) | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: I75b1e78423bee6518d77a8f2cec7eda971df619b
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | .gitmodules | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e3641c --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +/.clang-format + +# qtcreator generated files +*.pro.user* +*.qbs.user* + diff --git a/.gitmodules b/.gitmodules index 3551ff0..d066e40 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,19 +1,19 @@ [submodule "qtcreator"] path = qtcreator url = ../qt-creator - branch = master + branch = 4.8 [submodule "fossil"] path = plugins/fossil url = ../plugin-fossil-scm depends = qtcreator - branch = master + branch = 4.8 [submodule "haskell"] path = plugins/haskell url = ../plugin-haskell depends = qtcreator - branch = master + branch = 4.8 [submodule "pythonextensions"] path = plugins/pythonextensions url = ../plugin-pythonextensions depends = qtcreator - branch = master + branch = 4.8 |