Merge remote-tracking branch 'upstream/master' into more-float

# Conflicts:
#	README.md
#	docs/UnityAssertionsReference.md
This commit is contained in:
Jonathan Reichelt Gjertsen
2021-07-27 01:54:26 +02:00
12 changed files with 824 additions and 974 deletions

View File

@@ -10,7 +10,7 @@
#define UNITY_VERSION_MAJOR 2
#define UNITY_VERSION_MINOR 5
#define UNITY_VERSION_BUILD 2
#define UNITY_VERSION_BUILD 4
#define UNITY_VERSION ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD)
#ifdef __cplusplus