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-11-11 00:02:59 +01:00
16 changed files with 647 additions and 486 deletions

View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (GL3) 25.10.2018, based on milek-98b167a, tmj-b36ed8d"
#define VERSION_INFO "M7 (GL3) 10.11.2018, based on milek-a1926c8b, tmj-c59b530"