Merge branch 'master' into master

This commit is contained in:
Fire_Head 2019-06-13 03:47:13 +03:00 committed by GitHub
commit 9689def6a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 534 additions and 55 deletions

View file

@ -220,7 +220,7 @@ enum
FADE_1, // mid fade
FADE_2,
FADE_OUT,
FADE_OUT = 0,
FADE_IN,
};