jzmaddock 390d46de9e Merge branch 'develop' ...

Conflicts:
	doc/html/boost_multiprecision/indexes/s01.html
	doc/html/boost_multiprecision/indexes/s02.html
	doc/html/boost_multiprecision/indexes/s03.html
	doc/html/boost_multiprecision/indexes/s04.html
	doc/html/boost_multiprecision/map/hist.html
	doc/html/index.html
	doc/multiprecision.qbk
	include/boost/multiprecision/cpp_bin_float.hpp
	include/boost/multiprecision/cpp_int.hpp
	test/test_cpp_int.cpp

Resolved so as to make master and develop the same.

2015-10-18 12:05:14 +01:00

..

boost_multiprecision

Merge branch 'develop'

2015-10-18 12:05:14 +01:00

index.html

Merge branch 'develop'

2015-10-18 12:05:14 +01:00