Merge branch 'master' of github.com:cppformat/cppformat

This commit is contained in:
Victor Zverovich 2015-02-24 08:32:12 -08:00
commit 89fed501d4
2 changed files with 5 additions and 1 deletions

View File

@ -160,3 +160,7 @@ if (EXISTS .gitignore)
set(CPACK_RESOURCE_FILE_README ${FORMAT_SOURCE_DIR}/README.rst)
include(CPack)
endif ()
# Install our targets
install(TARGETS format DESTINATION lib)
install(FILES format.h DESTINATION include)

View File

@ -385,7 +385,7 @@ Documentation License
---------------------
The `Format String Syntax
<http://cppformat.readthedocs.org/en/latest/#format-string-syntax>`_
<http://cppformat.readthedocs.org/en/latest/syntax.html>`_
section in the documentation is based on the one from Python `string module
documentation <http://docs.python.org/3/library/string.html#module-string>`_
adapted for the current library. For this reason the documentation is