16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 00:09:18 +02:00

Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2018-10-11 16:02:01 +02:00
6 changed files with 25 additions and 18 deletions

View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 10.10.2018, based on master-52c8b40, tmj-8a904f4"
#define VERSION_INFO "M7 (GL3) 11.10.2018, based on master-c0d3cfda, tmj-67211a43"