Skip to content

Commit

Permalink
Merge branch 'develop' into fix/gmock_compat_matchers
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Oct 6, 2018
2 parents 0fba7ac + 30953ad commit 4a85097
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions CHANGES.md
Expand Up @@ -2,6 +2,14 @@

--------------------------------------------------

## Changes for 1.17.0

* Improved

* Bug fixes

--------------------------------------------------

## Changes for 1.16.6

* Improved
Expand Down
2 changes: 1 addition & 1 deletion docs/Doxyfile
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = iutest
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.16.99.0
PROJECT_NUMBER = 1.16.99.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
4 changes: 2 additions & 2 deletions include/iutest_ver.hpp
Expand Up @@ -17,11 +17,11 @@

//======================================================================
// define
#define IUTEST_VER 0x01169900u //!< iutest version 1.16.99.0
#define IUTEST_VER 0x01169901u //!< iutest version 1.16.99.1
#define IUTEST_MAJORVER 0x01u //!< Major Version
#define IUTEST_MINORVER 0x16u //!< Minor Version
#define IUTEST_MICROVER 0x99u //!< Micro Version
#define IUTEST_REVISION 0x00u //!< Revision
#define IUTEST_REVISION 0x01u //!< Revision

#define IUTEST_BUILD IUTEST_MICROVER //!< @deprecated

Expand Down

0 comments on commit 4a85097

Please sign in to comment.