Merge branch 'master' into 0.5.1-dev
- Conflicts:
- data/Credits.txt
- src/Functions.cpp
Description
Description
Details
Details
- Provenance
acme_pjz Authored on Sep 14 2018, 12:19 AM - Parents
- R79:17c2c3117965: sorry, I have to change the font again
R79:c13b140ac78c: Merge branch 'master' into 0.5.1-dev - Branches
- Unknown
- Tags
Event Timeline
Merged Changes
Merged Changes