aboutsummaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2017-01-29 11:00:59 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2017-01-29 11:00:59 +0100
commitaffa4b43443a980ff2e80441a9e340801ccc8159 (patch)
treef9d6d359250024160a3720d9bee6c8e45994074f /CONTRIBUTING.md
parentAdded qbs project file (diff)
downloadsmolbote-affa4b43443a980ff2e80441a9e340801ccc8159.tar.xz
Reading version tag from repo
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md16
1 files changed, 15 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58ba086..8ccc0e3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,18 @@
+### Versioning
+
+#### Major version
+Changed infrequently and almost entirely out of foppery and whim.
+
+#### Minor version
+Milestone of multiple features.
+
+#### Revision
+Major bugfixes and each new feature should get a revision.
+
+### Branching
+* master - main branch, should be kept up-to-date, and have only working code
+* development - development branch, anything goes there
+
### Folder structure
folder | description
@@ -8,7 +23,6 @@
/src/webengine | QWebEngine* subclasses
/test | test run location, mainly for QtCreator
-
### QtCreator
* In the project Run Settings set the working directory to _$repo/test_, and the
command line arguments to _-c ./config.ini_.