| 
								
								
									 Niels Lohmann | 9ff0cc0f02 | 📝 updated documentation | 2017-02-25 16:43:15 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 27c65b860b | 🔖 version 2.1.1 | 2017-02-25 16:34:38 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | eb08e8b09b | 📝 updated documentation | 2017-01-28 18:20:12 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 38e4935db0 | 📝 added example and documentation for the meta function | 2017-01-28 17:12:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 2f6260751c | 📝 fixed #434 | 2017-01-27 18:50:52 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 94d9b7bc86 | 📝 overworked documentation (re-added constructor examples) | 2017-01-25 21:59:54 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | ce0b3fe5a3 | 🚧 made type_name() public | 2017-01-21 16:12:17 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 7e2c4b3ead | 📝 updated online link | 2017-01-02 16:37:29 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | a507b9b46a | 🔖 updated documentation | 2016-12-16 21:25:20 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | dc6fc3e079 | 📝 clean up and added documentation for #358 | 2016-12-11 13:36:08 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | 44c0f811b1 | 🔖 version 2.0.8 | 2016-12-02 20:05:53 +01:00 |  | 
				
					
						| 
								
								
									 Niels Lohmann | aeb4f87a27 | ✨ added return value for emplace (#349) | 2016-11-28 18:33:46 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 1be73b903e | proposal for emplace/emplace_back (#349) | 2016-11-11 19:29:14 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 700977d73e | version bump | 2016-11-02 20:52:15 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 606098f45d | release 2.0.6 | 2016-10-15 16:47:45 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 2fa8ea0f74 | started fixing #323 | 2016-10-08 14:27:28 +02:00 |  | 
				
					
						| 
								
								
									 Vasil Dimov | b5128b1610 | Fix usage examples' comments for std::multiset | 2016-10-04 18:53:44 +03:00 |  | 
				
					
						| 
								
								
									 Niels | 3d104f1d43 | version bump | 2016-09-14 23:06:39 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 768d66560e | version bump | 2016-09-11 23:36:59 +02:00 |  | 
				
					
						| 
								
								
									 Niels | df9fd6237e | release 2.0.3 | 2016-08-31 21:27:23 +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 |  | 
				
					
						| 
								
								
									 Niels | 04c6c886eb | another experiment | 2016-08-24 21:02:33 +02:00 |  | 
				
					
						| 
								
								
									 Niels | a79d634ccb | integrated proposals for #290 | 2016-08-22 21:40:07 +02:00 |  | 
				
					
						| 
								
								
									 Niels | b4571360df | more on #290 | 2016-08-21 12:35:40 +02:00 |  | 
				
					
						| 
								
								
									 Niels | a05df038cd | prepared release | 2016-07-31 13:37:04 +02:00 |  | 
				
					
						| 
								
								
									 Niels | d08e013dd0 | improved documentation | 2016-07-25 16:06:13 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 26cab42c38 | some minor improvements | 2016-07-01 16:52:05 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 1c719561b0 | update of documentation links | 2016-06-24 00:14:27 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 0a393b8374 | indentation cleanup | 2016-05-12 07:34:36 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 9ecf83f630 | working on #235 | 2016-05-08 20:28:20 +02:00 |  | 
				
					
						| 
								
								
									 Niels | ea84a85b13 | simplified flatten/unflatten examples | 2016-04-30 10:39:03 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 1d3b4dd158 | added test cases | 2016-04-30 00:03:47 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 5e0bf75d60 | cleanup, test, and diff | 2016-04-25 23:17:04 +02:00 |  | 
				
					
						| 
								
								
									 Niels | f4107d0d9c | updated documentation | 2016-04-17 23:36:37 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 08c97df420 | added examples | 2016-04-17 23:18:07 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 6268287940 | improved documentation and test coverage | 2016-04-17 22:08:21 +02:00 |  | 
				
					
						| 
								
								
									 Niels | f883a04c87 | more documentation | 2016-04-17 18:18:49 +02:00 |  | 
				
					
						| 
								
								
									 Niels | 40e899a819 | cleanup and documentation | 2016-04-17 17:39:35 +02:00 |  | 
				
					
						| 
								
								
									 Niels | d869b0a387 | updated online documentation | 2016-02-14 22:28:56 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 236b7afff5 | updated and fixed online version | 2016-02-07 15:07:17 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 2c720b26ab | added a constructor from an input stream | 2016-02-05 19:24:42 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 6aa881988d | improved documentation | 2016-01-31 13:05:39 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 9d063d90e3 | removed "using namespace" from examples | 2016-01-30 20:23:14 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 2468631dc9 | overworked examples | 2016-01-26 20:07:03 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 2b13711009 | updated online version | 2016-01-24 23:02:28 +01:00 |  | 
				
					
						| 
								
								
									 Niels | c09d03fba7 | fixed documentation | 2016-01-24 22:43:00 +01:00 |  | 
				
					
						| 
								
								
									 Niels | a04bd4f851 | cleanup after #184 | 2016-01-20 21:14:58 +01:00 |  | 
				
					
						| 
								
								
									 dariomt | e1645a09e9 | Merge branch 'master' of https://github.com/nlohmann/json | 2016-01-18 10:08:58 +01:00 |  | 
				
					
						| 
								
								
									 Niels | 67c2d90a21 | working on #160 | 2015-12-22 13:27:40 +01:00 |  |