1134 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Niels	542a48a16a	Merge branch 'release/2.0.6' into develop	2016-10-15 16:48:08 +02:00
Niels	606098f45d	release 2.0.6	2016-10-15 16:47:45 +02:00
Niels	67b9f1936d	cleanup after closing #324	2016-10-12 22:05:45 +02:00
Niels Lohmann	bb9d87ad55	Merge pull request #324 from vpetrigo/has_mapped_improve ... make has_mapped_type struct friendly	2016-10-12 21:59:56 +02:00
Niels	e7a60d8961	Merge branch 'feature/issue323' into develop	2016-10-12 21:21:59 +02:00
Niels	470197bd0b	improve test coverage	2016-10-10 21:58:31 +02:00
Niels	d3e7f9da67	code cleanup for #323	2016-10-10 20:38:50 +02:00
Niels	97280bbcfc	added missing header	2016-10-09 16:32:01 +02:00
Vladimir Petrigo	e9fde3e116	make has_mapped_type struct friendly	2016-10-08 16:50:23 +03:00
Niels	54bf5f20e9	adjusted README	2016-10-08 14:33:10 +02:00
Niels	2fa8ea0f74	started fixing #323	2016-10-08 14:27:28 +02:00
Niels	a0ef5a194c	addressed #319, #321, and #318	2016-10-06 23:27:43 +02:00
Niels Lohmann	04b11d78ff	Merge pull request #318 from ChristophJud/include_dir_relocation ... Include dir relocation	2016-10-06 22:35:36 +02:00
Niels Lohmann	8173c370f6	Merge pull request #321 from vasild/develop ... Fix usage examples' comments for std::multiset	2016-10-06 22:33:58 +02:00
Niels	b6550b35c3	fix after #313	2016-10-04 18:20:36 +02:00
Vasil Dimov	b5128b1610	Fix usage examples' comments for std::multiset	2016-10-04 18:53:44 +03:00
Niels Lohmann	963efb1f09	Merge pull request #313 from 5tefan/develop ... trivial documentation fix	2016-10-02 11:29:49 +02:00
Niels	d6005e59a5	added fuzzing results	2016-10-02 11:23:47 +02:00
Christoph Jud	e1b6a23049	relocation of install-include directory for other packages	2016-09-26 12:15:03 +02:00
Stefan Codrescu	be61091401	trivial documentation fix	2016-09-16 18:15:36 -06:00
Niels	e4366688f7	v2.0.5	2016-09-14 23:42:12 +02:00
Niels	5dfd2c9bdf	Merge branch 'release/2.0.5' into develop	2016-09-14 23:07:14 +02:00
Niels	5879eb0be3	Merge branch 'release/2.0.5'	2016-09-14 23:06:53 +02:00
Niels	3d104f1d43	version bump	2016-09-14 23:06:39 +02:00
Niels	6bbcdc1ec5	fixes #310	2016-09-14 22:48:12 +02:00
Niels	7b6cba23f3	results for #307	2016-09-12 21:23:12 +02:00
Niels	24c588cd25	Merge branch 'release/2.0.4' into develop	2016-09-11 23:37:30 +02:00
Niels	f209be1142	Merge branch 'release/2.0.4'	2016-09-11 23:37:11 +02:00
Niels	768d66560e	version bump	2016-09-11 23:36:59 +02:00
Niels	15925469c6	Travis updated their Xcode	2016-09-11 22:50:40 +02:00
Niels	f922426ec3	fixed #304	2016-09-11 22:40:51 +02:00
Niels	2daab5a4c2	fixed #306	2016-09-11 22:30:08 +02:00
Niels	8ea0ee502d	clang 3.9.0 is not working yet	2016-09-03 13:08:17 +02:00
Niels	fa0299f03a	moved cmake into clang	2016-09-03 12:30:10 +02:00
Niels	36745ed296	install from tarball	2016-09-03 10:34:52 +02:00
Niels	f0455b401d	forgot sh call	2016-09-03 09:44:10 +02:00
Niels	e0d809312b	the cmake in apt is too old	2016-09-03 09:17:30 +02:00
Niels	bfd6678800	clang 3.9.0 needs a newer cmake	2016-09-03 08:47:07 +02:00
Niels	9639f0dfb3	Clang 3.9.0 has been released	2016-09-03 00:37:45 +02:00
Niels	625370a1ad	Merge branch 'develop'	2016-09-02 16:05:38 +02:00
Niels	357baeff5a	release 2.0.3	2016-09-01 08:07:52 +02:00
Niels	42be2edd4c	fixed test coverage	2016-09-01 00:29:42 +02:00
Niels	c8d01fa7b9	Merge branch 'release/2.0.3' into develop	2016-08-31 21:27:50 +02:00
Niels	2c82f25272	Merge branch 'release/2.0.3'	2016-08-31 21:27:32 +02:00
Niels	df9fd6237e	release 2.0.3	2016-08-31 21:27:23 +02:00
Niels	776880bc49	Merge branch 'feature/iterator_range_parsing' into develop	2016-08-31 20:23:24 +02:00
Niels	740b66f225	cleanup	2016-08-31 20:23:21 +02:00
Niels	58cbf4b3ef	added another test case	2016-08-31 18:23:46 +02:00
Niels	ae7aaed4ac	Merge branch 'develop' into feature/iterator_range_parsing	2016-08-31 18:07:18 +02:00
Niels	442058f8ed	interface cleanup	2016-08-31 17:07:35 +02:00