| Age | Commit message (Collapse) | Author |
|---|
|
'ivan-github/feature/improve-git-release-workflow' into develop
|
|
This allows us to have master and develop in sync after the release.
Also get a correct and clean version report.
I've included the `-m` switch in the `git tag` command so we avoid to
open an editor and let us closer to make a script to automate this.
|
|
|
|
|
|
|
|
into develop
|
|
|
|
With this change we are following more accurately:
http://nvie.com/posts/a-successful-git-branching-model/
Also, we achieve a clean version in master.
If we do the tag before the merge in master, then we would have an extra
commit after the tagging, which causes version to be X.Y.Z-1-blah.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
'ivan-github/bug/3791_prevent-last-window-close-app' into develop
|
|
|
|
|
|
'ivan-github/bug/3714_fix-logger-saving-several-line-returns' into develop
|
|
|
|
|
|
|
|
|
|
'ivan-github/feature/3758_improve-systray-tooltip' into develop
|
|
|
|
|
|
|
|
'ivan-github/bug/3617_remove-exec-bit-update-docs' into develop
|
|
develop
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
into develop
|
|
|
|
'ivan-github/feature/3659_display-mx-status-in-tray' into develop
|
|
|
|
|
|
|
|
develop
|
|
|
|
|
|
Otherwise, we are dumped into a nasty console.
|
