aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--.gitmodules8
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