Merge branch 'master' into ZSMv1
This commit is contained in:
commit
c3654eb67c
138 changed files with 10160 additions and 2938 deletions
|
|
@ -46,8 +46,8 @@
|
|||
#define BUSY_BEGIN_SOFT softLocked=true; isBusy.lock();
|
||||
#define BUSY_END isBusy.unlock(); softLocked=false;
|
||||
|
||||
#define DIV_VERSION "dev114"
|
||||
#define DIV_ENGINE_VERSION 114
|
||||
#define DIV_VERSION "0.6pre1.5"
|
||||
#define DIV_ENGINE_VERSION 116
|
||||
// for imports
|
||||
#define DIV_VERSION_MOD 0xff01
|
||||
#define DIV_VERSION_FC 0xff02
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue