Robert Ramey
|
36e320d987
|
Merge branch 'develop'
Conflicts:
doc/boostbook/HTML.manifest
doc/boostbook/automatic.xml
doc/boostbook/native.xml
doc/boostbook/safe_numerics.xml
doc/html/bibliography.html
doc/html/exception_policies.html
doc/html/exception_policy.html
doc/html/exception_safety.html
doc/html/index.html
doc/html/integer.html
doc/html/introduction.html
doc/html/numeric.html
doc/html/pending_issues.html
doc/html/promotion_policies.html
doc/html/promotion_policy.html
doc/html/rationale.html
doc/html/safe.html
doc/html/safe_numeric_concept.html
doc/html/safe_unsigned_range.html
doc/html/tutorial/7.html
|
2015-12-09 21:52:59 -08:00 |
|