Merge branch 'master' into 0.5.1-dev
- Conflicts:
- src/Globals.h
Description
Description
Details
Details
- Provenance
acme_pjz Authored on Oct 9 2018, 4:57 AM - Parents
- R79:e948a684b846: update authors and changelog; finally bump the version to 0.5
R79:7c4d7cc7f9b5: Merge branch 'master' into 0.5.1-dev - Branches
- Unknown
- Tags
Event Timeline
Merged Changes
Merged Changes