merged

e7330980 · Davis King · 08ca25c2 · cda70c9b · e7330980 · e7330980
Commit e7330980 authored Feb 21, 2017 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

.hgtags .hgtags +1 -0

dlib/CMakeLists.txt dlib/CMakeLists.txt +1 -1

docs/.logger_revnum docs/.logger_revnum +1 -1

No files found.
--- a/.hgtags
+++ b/.hgtags
@@ -32,3 +32,4 @@ ce6f364987865b19bdb1b4730ac5403e2bb55dc4 v18.17
 7210589728f6d83f6cb7d21cd24d114a5364d9e2 v19.0
 ad6cd2a3bfd54d48f6b4a1b6d3ef8c0ce278a8d9 v19.1
 f8fa027c760270d8122427838b89e95ccf0b80a1 v19.2
+26cdc89f4795a1f924d80d208b9ed22437c01600 v19.3
--- a/dlib/CMakeLists.txt
+++ b/dlib/CMakeLists.txt
@@ -14,7 +14,7 @@ include(cmake_utils/use_cpp_11.cmake)

 set(CPACK_PACKAGE_VERSION_MAJOR "19")
 set(CPACK_PACKAGE_VERSION_MINOR "3")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "99")
 set(VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 # Set DLIB_VERSION in the including CMake file so they can use it to do whatever they want. 
 get_directory_property(has_parent PARENT_DIRECTORY)

--- a/docs/.logger_revnum
+++ b/docs/.logger_revnum
-9d2cc9605dab
+6e6485a3087c