Skip to content

Commit

Permalink
Merge pull request #1551 from barcharcraz/make-release-2.10.17
Browse files Browse the repository at this point in the history
mint 2.10.17
  • Loading branch information
barcharcraz committed Dec 31, 2020
2 parents fca7ac8 + 5fda55a commit 41e7d00
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Release/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ endif()

set(CPPREST_VERSION_MAJOR 2)
set(CPPREST_VERSION_MINOR 10)
set(CPPREST_VERSION_REVISION 16)
set(CPPREST_VERSION_REVISION 17)

enable_testing()

Expand Down
2 changes: 1 addition & 1 deletion Release/include/cpprest/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
*/
#define CPPREST_VERSION_MINOR 10
#define CPPREST_VERSION_MAJOR 2
#define CPPREST_VERSION_REVISION 16
#define CPPREST_VERSION_REVISION 17

#define CPPREST_VERSION (CPPREST_VERSION_MAJOR * 100000 + CPPREST_VERSION_MINOR * 100 + CPPREST_VERSION_REVISION)
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
cpprestsdk (2.10.17)
* PR#1550 Fix year calculation for the last day of a leap year
* PR#1523 Fix wrong linking of Apple Frameworks on MacOS
* PR#1520 Define __STDC_FORMAT_MACROS when it hasn't been defined to avoid duplicate define error.
* PR#1415 Delete apparently broken .vcxprojs and .pfxes.
* Removed defunct email contact information from the readme
-- cpprestsdk team WED, 30 Dec 2020 20:08:00 -0700

cpprestsdk (2.10.16)
* PR#1383 CMake fixes + CMake search for OpenSSL (macOS)
* PR#1392 Update submodule websocketpp to 0.8.2
Expand Down

0 comments on commit 41e7d00

Please sign in to comment.