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

Merge branch 'master' into gfx-work

This commit is contained in:
milek7
2018-09-20 19:14:28 +02:00
114 changed files with 9353 additions and 6114 deletions

View File

@@ -1 +1 @@
#define VERSION_INFO "M7 22.07.2018, based on tmj 460bf6d"
#define VERSION_INFO "M7 (GL3) 20.09.2018, based master-d9687a4, tmj-e881092"